Commit fd582ec8 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

ppc: Various minor compile fixes 



This fixes up a variety of minor problems in compiling with ARCH=ppc
arising from using the merged versions of various header files.
A lot of the changes are just adding #include <asm/machdep.h> to
files that use ppc_md or smp_ops_t.

This also arranges for us to use semaphore.c, vecemu.c, vector.S and
fpu.S from arch/powerpc/kernel when compiling with ARCH=ppc.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 35d81a4b

arch/powerpc/kernel/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ CFLAGS_prom_init.o += -fPIC 
CFLAGS_btext.o		+= -fPIC

endif



obj-y				:= semaphore.o traps.o

obj-y				:= semaphore.o

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

obj-$(CONFIG_POWER4)		+= idle_power4.o
@@ -28,7 +28,7 @@ extra-$(CONFIG_PPC_FPU) += fpu.o 
extra-y				+= vmlinux.lds



obj-y				+= process.o init_task.o \

				   prom.o systbl.o

				   prom.o systbl.o traps.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o

obj-$(CONFIG_PPC64)		+= setup_64.o misc_64.o

obj-$(CONFIG_PPC_OF)		+= prom_init.o of_device.o
@@ -39,4 +39,12 @@ ifeq ($(CONFIG_PPC_ISERIES),y) 
$(obj)/head_64.o: $(obj)/lparmap.s

AFLAGS_head_64.o += -I$(obj)

endif



else

# stuff used from here for ARCH=ppc or ARCH=ppc64

obj-$(CONFIG_PPC64)		+= traps.o



fpux-$(CONFIG_PPC32)		+= fpu.o

extra-$(CONFIG_PPC_FPU)		+= $(fpux-y)



endif

arch/powerpc/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ int main(void) 
	DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));

	DEFINE(pbe_next, offsetof(struct pbe, next));



	DEFINE(TASK_SIZE, TASK_SIZE);

	DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28);

#else /* CONFIG_PPC64 */

	/* systemcfg offsets for use by vdso */

arch/powerpc/platforms/4xx/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# empty makefile so make clean works
 
 No newline at end of file

arch/powerpc/platforms/85xx/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# empty makefile so make clean works

arch/ppc/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -57,9 +57,10 @@ head-$(CONFIG_FSL_BOOKE) := arch/ppc/kernel/head_fsl_booke.o 


head-$(CONFIG_6xx)		+= arch/ppc/kernel/idle_6xx.o

head-$(CONFIG_POWER4)		+= arch/ppc/kernel/idle_power4.o

head-$(CONFIG_PPC_FPU)		+= arch/ppc/kernel/fpu.o

head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o



core-y				+= arch/ppc/kernel/ arch/ppc/platforms/ \

core-y				+= arch/ppc/kernel/ arch/powerpc/kernel/ \

				   arch/ppc/platforms/ \

				   arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/

core-$(CONFIG_4xx)		+= arch/ppc/platforms/4xx/

core-$(CONFIG_83xx)		+= arch/ppc/platforms/83xx/

CRA Git | Maintained and supported by SUSTech CRA and CCSE