diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2007-04-29 09:31:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-04-30 15:24:47 +0100 |
| commit | 8903fcce9b91bab6bb98adbb57a4edfc372c8bff (patch) | |
| tree | 2afd7bd442724e35da774b4c1bef016b74814301 /arch/arm/plat-iop/time.c | |
| parent | 235b185ce47ce64793362bd3ae4bcd8afc6b57b8 (diff) | |
| download | kernel_samsung_tuna-8903fcce9b91bab6bb98adbb57a4edfc372c8bff.zip kernel_samsung_tuna-8903fcce9b91bab6bb98adbb57a4edfc372c8bff.tar.gz kernel_samsung_tuna-8903fcce9b91bab6bb98adbb57a4edfc372c8bff.tar.bz2 | |
[ARM] 4340/1: iop: fix iop_getttimeoffset
Fix a typo which causes a necessary cpwait to be missed on iop3xx, Michael
Brunner <mibru@gmx.de>
Save a register in the assembly routine, rmk
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-iop/time.c')
| -rw-r--r-- | arch/arm/plat-iop/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 16300ad..0cc26da 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c @@ -32,22 +32,22 @@ static unsigned long next_jiffy_time; unsigned long iop_gettimeoffset(void) { - unsigned long offset, temp1, temp2; + unsigned long offset, temp; /* enable cp6, if necessary, to avoid taking the overhead of an * undefined instruction trap */ asm volatile ( "mrc p15, 0, %0, c15, c1, 0\n\t" - "ands %1, %0, #(1 << 6)\n\t" + "tst %0, #(1 << 6)\n\t" "orreq %0, %0, #(1 << 6)\n\t" "mcreq p15, 0, %0, c15, c1, 0\n\t" -#ifdef CONFIG_XSCALE +#ifdef CONFIG_CPU_XSCALE "mrceq p15, 0, %0, c15, c1, 0\n\t" "moveq %0, %0\n\t" "subeq pc, pc, #4\n\t" #endif - : "=r"(temp1), "=r"(temp2) : : "cc"); + : "=r"(temp) : : "cc"); offset = next_jiffy_time - read_tcr1(); |