diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:18:10 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:18:10 -0700 |
| commit | 8d7e35174d02ce76e910365acaaefc281a0b72a0 (patch) | |
| tree | 4445375bbf8c08f8032c5a013374777931949285 /include/asm-ia64 | |
| parent | 564601a5d12f93fdde04c6bc5b097b95e7752a46 (diff) | |
| download | linux-8d7e35174d02ce76e910365acaaefc281a0b72a0.tar.gz | |
[IA64] fix generic/up builds
Jesse Barnes provided the original version of this patch months ago, but
other changes kept conflicting with it, so it got deferred. Greg Edwards
dug it out of obscurity just over a week ago, and almost immediately
another conflicting patch appeared (Bob Picco's memory-less nodes).
I've resolved the conflicts and got it running again. CONFIG_SGI_TIOCX
is set to "y" in defconfig, which causes a Tiger to not boot (oops in
tiocx_init). But that can be resolved later ... get this in now before it
gets stale again.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/sn/arch.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/sn/sn_cpuid.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h index 635fdce854a84..ab827d2985698 100644 --- a/include/asm-ia64/sn/arch.h +++ b/include/asm-ia64/sn/arch.h @@ -11,6 +11,7 @@ #ifndef _ASM_IA64_SN_ARCH_H #define _ASM_IA64_SN_ARCH_H +#include <linux/numa.h> #include <asm/types.h> #include <asm/percpu.h> #include <asm/sn/types.h> diff --git a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h index 20b3001876698..d2c1d34dcce4e 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) /* |