diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /include/asm-m32r/smp.h | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
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 | { |