diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /include/asm-m32r/smp.h | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
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 b9a20cdad65f..7885b7df84a2 100644 --- a/include/asm-m32r/smp.h +++ b/include/asm-m32r/smp.h | |||
| @@ -61,9 +61,7 @@ extern physid_mask_t phys_cpu_present_map; | |||
| 61 | * Some lowlevel functions might want to know about | 61 | * Some lowlevel functions might want to know about |
| 62 | * the real CPU ID <-> CPU # mapping. | 62 | * the real CPU ID <-> CPU # mapping. |
| 63 | */ | 63 | */ |
| 64 | extern volatile int physid_2_cpu[NR_CPUS]; | ||
| 65 | extern volatile int cpu_2_physid[NR_CPUS]; | 64 | extern volatile int cpu_2_physid[NR_CPUS]; |
| 66 | #define physid_to_cpu(physid) physid_2_cpu[physid] | ||
| 67 | #define cpu_to_physid(cpu_id) cpu_2_physid[cpu_id] | 65 | #define cpu_to_physid(cpu_id) cpu_2_physid[cpu_id] |
| 68 | 66 | ||
| 69 | #define raw_smp_processor_id() (current_thread_info()->cpu) | 67 | #define raw_smp_processor_id() (current_thread_info()->cpu) |