summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/setup.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2010-02-26 12:04:13 -0800
committerTony Luck <tony.luck@intel.com>2010-02-26 12:04:13 -0800
commit8d6339b8a532ec4eeb31db321cf1e6068965deda (patch)
tree0fa1d7aa14d3dcc6f6ac5236ba14649fd9a0d5e6 /arch/ia64/kernel/setup.c
parent60b341b778cc2929df16c0a504c91621b3c6a4ad (diff)
parent32974ad4907cdde6c9de612cd1b2ee0568fb9409 (diff)
downloadop-kernel-dev-8d6339b8a532ec4eeb31db321cf1e6068965deda.zip
op-kernel-dev-8d6339b8a532ec4eeb31db321cf1e6068965deda.tar.gz
Pull rmia32 into release branch
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r--arch/ia64/kernel/setup.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index a1ea879..41ae6a5 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -46,7 +46,6 @@
#include <linux/kexec.h>
#include <linux/crash_dump.h>
-#include <asm/ia32.h>
#include <asm/machvec.h>
#include <asm/mca.h>
#include <asm/meminit.h>
@@ -1016,10 +1015,6 @@ cpu_init (void)
ia64_mmu_init(ia64_imva(cpu_data));
ia64_mca_cpu_init(ia64_imva(cpu_data));
-#ifdef CONFIG_IA32_SUPPORT
- ia32_cpu_init();
-#endif
-
/* Clear ITC to eliminate sched_clock() overflows in human time. */
ia64_set_itc(0);
OpenPOWER on IntegriCloud