diff options
| author | Arnd Bergmann | 2012-03-15 17:11:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-03-15 17:11:40 +0100 |
| commit | 86a30bece9ad4cc91c393a829a7b128291e0fb65 (patch) | |
| tree | 6cb3e6ad413d74118535f77436056c8d3cfae0eb /arch/x86/lib/delay.c | |
| parent | MAINTAINERS: ARM: tegra: update Stephen's email address (diff) | |
| parent | MAINTAINERS: update MAINTAINERS email entry (diff) | |
| download | kernel-qcow2-linux-86a30bece9ad4cc91c393a829a7b128291e0fb65.tar.gz kernel-qcow2-linux-86a30bece9ad4cc91c393a829a7b128291e0fb65.tar.xz kernel-qcow2-linux-86a30bece9ad4cc91c393a829a7b128291e0fb65.zip | |
Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/maintainers
* 'fixes-non-critical' of git://github.com/hzhuang1/linux:
MAINTAINERS: update MAINTAINERS email entry
MAINTAINERS: update maintainer entry for pxa/hx4700
(update to v3.3-rc7)
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(); |