diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 20:37:07 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 20:37:07 (GMT) |
commit | 5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231 (patch) | |
tree | 29dd80a7b33426d0890aa07b5864224557c62af7 /arch/parisc | |
parent | 0bb943c7a2136716757a263f604d26309fd98042 (diff) | |
parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
download | linux-fsl-qoriq-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.tar.xz |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/include/asm/smp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h index 398cdba..409e698 100644 --- a/arch/parisc/include/asm/smp.h +++ b/arch/parisc/include/asm/smp.h @@ -44,8 +44,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask); #define PROC_CHANGE_PENALTY 15 /* Schedule penalty */ -extern unsigned long cpu_present_mask; - #define raw_smp_processor_id() (current_thread_info()->cpu) #else /* CONFIG_SMP */ |