diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 13:24:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 13:24:51 -0400 |
| commit | 043d051615aa5da09a7e44f1edbb69798458e067 (patch) | |
| tree | a0bfe7f6ed6efa4e0eb7f6b9891a0dc3f2fafe57 /include/asm-ia64/sn/sn_cpuid.h | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
| parent | 21517a57e838a1fbb7a54a8a77501024e77f83e0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/sn_cpuid.h')
| -rw-r--r-- | include/asm-ia64/sn/sn_cpuid.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h index 20b300187669..d2c1d34dcce4 100644 --- a/include/asm-ia64/sn/sn_cpuid.h +++ b/include/asm-ia64/sn/sn_cpuid.h | |||
| @@ -81,11 +81,6 @@ | |||
| 81 | * | 81 | * |
| 82 | */ | 82 | */ |
| 83 | 83 | ||
| 84 | #ifndef CONFIG_SMP | ||
| 85 | #define cpu_physical_id(cpuid) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff) | ||
| 86 | #endif | ||
| 87 | |||
| 88 | |||
| 89 | #define get_node_number(addr) NASID_GET(addr) | 84 | #define get_node_number(addr) NASID_GET(addr) |
| 90 | 85 | ||
| 91 | /* | 86 | /* |