diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 12:37:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 12:37:14 -0500 |
| commit | b2b062b8163391c42b3219d466ca1ac9742b9c7b (patch) | |
| tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /include/asm-m32r/smp.h | |
| 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 'include/asm-m32r/smp.h')
| -rw-r--r-- | include/asm-m32r/smp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h index c5dd66916692..b96a6d2ffbc3 100644 --- a/include/asm-m32r/smp.h +++ b/include/asm-m32r/smp.h | |||
| @@ -63,8 +63,6 @@ extern volatile int cpu_2_physid[NR_CPUS]; | |||
| 63 | #define raw_smp_processor_id() (current_thread_info()->cpu) | 63 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
| 64 | 64 | ||
| 65 | extern cpumask_t cpu_callout_map; | 65 | extern cpumask_t cpu_callout_map; |
| 66 | extern cpumask_t cpu_possible_map; | ||
| 67 | extern cpumask_t cpu_present_map; | ||
| 68 | 66 | ||
| 69 | static __inline__ int hard_smp_processor_id(void) | 67 | static __inline__ int hard_smp_processor_id(void) |
| 70 | { | 68 | { |