]> nv-tegra.nvidia Code Review - linux-3.10.git/commit
[IA64] fix generic/up builds
authorTony Luck <tony.luck@intel.com>
Thu, 7 Jul 2005 01:18:10 +0000 (18:18 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 7 Jul 2005 01:18:10 +0000 (18:18 -0700)
commit8d7e35174d02ce76e910365acaaefc281a0b72a0
tree4445375bbf8c08f8032c5a013374777931949285
parent564601a5d12f93fdde04c6bc5b097b95e7752a46
[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>
arch/ia64/kernel/Makefile
arch/ia64/kernel/acpi.c
arch/ia64/kernel/numa.c [new file with mode: 0644]
arch/ia64/kernel/smpboot.c
arch/ia64/mm/discontig.c
include/asm-ia64/sn/arch.h
include/asm-ia64/sn/sn_cpuid.h