diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:26:33 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:26:33 -0600 |
| commit | 0c129f1be7a29163e62899254326d8d15a9d3ef9 (patch) | |
| tree | 3db454a7d00e4dc24b80249b18c13e07170f2634 /arch | |
| parent | 3c26454dc04f150f577049bf1f1adf6c999f126b (diff) | |
CR ENGR00050116 Fix flawed implementation of XIP Macros
Patch for CR ENGR00050116 Fix flawed implementation of XIP Macros.
The existing flawed implementations of xip_currtime, xip_elasped_since
and xip_irqpending macros are fixed. Applies to linux 2.6.22 kernel
for MX platforms.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-CR-ENGR00050116-Fix-flawed-implementation-.patch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx27/time.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/time.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx27/time.c b/arch/arm/mach-mx27/time.c index 30d8dbcb192c..3d471b053a5a 100644 --- a/arch/arm/mach-mx27/time.c +++ b/arch/arm/mach-mx27/time.c @@ -36,6 +36,7 @@ #include <linux/io.h> #include <linux/clocksource.h> #include <linux/clockchips.h> +#include <linux/mtd/xip.h> #include <asm/hardware.h> #include <asm/mach/time.h> @@ -161,7 +162,7 @@ static struct irqaction timer_irq = { .handler = mxc_timer_interrupt, }; -static cycle_t mxc_gpt_read(void) +static cycle_t __xipram mxc_gpt_read(void) { return __raw_readl(MXC_GPT_GPTCNT); } diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c index 4dd10c3f4c7e..5f83111c08db 100644 --- a/arch/arm/plat-mxc/time.c +++ b/arch/arm/plat-mxc/time.c @@ -35,6 +35,7 @@ #include <linux/io.h> #include <linux/clocksource.h> #include <linux/clockchips.h> +#include <linux/mtd/xip.h> #include <asm/hardware.h> #include <asm/mach/time.h> @@ -185,7 +186,7 @@ static struct irqaction timer_irq = { .handler = mxc_timer_interrupt, }; -static cycle_t mxc_gpt_read(void) +static cycle_t __xipram mxc_gpt_read(void) { return __raw_readl(MXC_GPT_GPTCNT); } |