diff options
| author | Arnd Bergmann | 2012-03-19 21:46:32 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-03-20 10:41:43 +0100 |
| commit | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (patch) | |
| tree | 065282434bde6ef9b4357c042705c5fcef3782ea /arch/x86/lib/delay.c | |
| parent | Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge branch 'renesas/fixes' into renesas/soc (diff) | |
| download | kernel-qcow2-linux-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.tar.gz kernel-qcow2-linux-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.tar.xz kernel-qcow2-linux-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.zip | |
Merge branch 'renesas/timer' into next/timer
Conflicts:
arch/arm/mach-shmobile/timer.c
This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/x86/lib/delay.c')
| -rw-r--r-- | arch/x86/lib/delay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c index fc45ba887d05..e395693abdb1 100644 --- a/arch/x86/lib/delay.c +++ b/arch/x86/lib/delay.c @@ -48,9 +48,9 @@ static void delay_loop(unsigned long loops) } /* TSC based delay: */ -static void delay_tsc(unsigned long loops) +static void delay_tsc(unsigned long __loops) { - unsigned long bclock, now; + u32 bclock, now, loops = __loops; int cpu; preempt_disable(); |