diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
| commit | b2b062b8163391c42b3219d466ca1ac9742b9c7b (patch) | |
| tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /arch/arm/mach-imx/time.c | |
| parent | a9de18eb761f7c1c860964b2e5addc1a35c7e861 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-imx/time.c')
| -rw-r--r-- | arch/arm/mach-imx/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index a11765f5f23b..aff0ebcfa847 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -184,7 +184,7 @@ static int __init imx_clockevent_init(unsigned long rate) clockevent_imx.min_delta_ns = clockevent_delta2ns(0xf, &clockevent_imx); - clockevent_imx.cpumask = cpumask_of_cpu(0); + clockevent_imx.cpumask = cpumask_of(0); clockevents_register_device(&clockevent_imx); |