diff options
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/setup.c (renamed from arch/x86/kernel/setup_32.c) | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 5e1537b6253..212804e7878 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -18,7 +18,7 @@ CFLAGS_tsc_64.o := $(nostackp) obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o obj-y += traps_$(BITS).o irq_$(BITS).o obj-y += time_$(BITS).o ioport.o ldt.o -obj-y += setup_$(BITS).o i8259.o irqinit_$(BITS).o setup_percpu.o +obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o obj-$(CONFIG_X86_32) += probe_roms_32.o obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup.c index 4d5f8a3eb7e..222d7038f2f 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup.c @@ -79,6 +79,7 @@ #include <asm/mpspec.h> #include <asm/setup.h> #include <asm/arch_hooks.h> +#include <asm/efi.h> #include <asm/sections.h> #include <asm/dmi.h> #include <asm/io_apic.h> @@ -110,6 +111,9 @@ #include <asm/sections.h> #include <asm/topology.h> #include <asm/apicdef.h> +#ifdef CONFIG_X86_64 +#include <asm/numa_64.h> +#endif #ifdef CONFIG_X86_32 #include <asm/highmem.h> #endif @@ -531,9 +535,6 @@ void __init setup_arch(char **cmdline_p) #endif /* max_pfn_mapped is updated here */ -#ifdef CONFIG_X86_64 - max_pfn_mapped = -#endif max_pfn_mapped = init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT)); reserve_initrd(); |