Commit 55f26239 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: rename setup_32.c to setup.c 



and let 64 bit use that instead of setup_64.c

[ mingo@elte.hu ]

x86: build fix

fix:

arch/x86/kernel/setup.c: In function ‘setup_arch':
arch/x86/kernel/setup.c:561: error: implicit declaration of function ‘efi_reserve_early'

and:

arch/x86/kernel/setup.c:766: error: implicit declaration of function 'init_cpu_to_node'

and:

arch/x86/kernel/setup.c:676: warning: operation on 'max_pfn_mapped' may be undefined

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f2f865fe

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/setup_32.c→arch/x86/kernel/setup.c

+4 −3
Original line number Diff line number Diff line
@@ -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();

CRA Git | Maintained and supported by SUSTech CRA and CCSE