aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/sn/sn_cpuid.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-13 16:23:51 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-13 16:23:51 -0400
commit327309e899662b482c58cf25f574513d38b5788c (patch)
tree069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/asm-ia64/sn/sn_cpuid.h
parent0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff)
parentc32511e2718618f0b53479eb36e07439aa363a74 (diff)
downloadkernel_samsung_crespo-327309e899662b482c58cf25f574513d38b5788c.zip
kernel_samsung_crespo-327309e899662b482c58cf25f574513d38b5788c.tar.gz
kernel_samsung_crespo-327309e899662b482c58cf25f574513d38b5788c.tar.bz2
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'include/asm-ia64/sn/sn_cpuid.h')
-rw-r--r--include/asm-ia64/sn/sn_cpuid.h5
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 20b3001..d2c1d34 100644
--- a/include/asm-ia64/sn/sn_cpuid.h
+++ b/include/asm-ia64/sn/sn_cpuid.h
@@ -81,11 +81,6 @@
*
*/
-#ifndef CONFIG_SMP
-#define cpu_physical_id(cpuid) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
-#endif
-
-
#define get_node_number(addr) NASID_GET(addr)
/*