Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: move lparmap.c to arch/powerpc/kernel

Since lparmap.s gets included in arch/powerpc/kernel/head_64.S,
this avoids depending on a file in another directory.

Signed-off-by: Paul Mackerras <paulus@samba.org>

+5 -4
+3 -2
arch/powerpc/kernel/Makefile
··· 33 33 obj-$(CONFIG_BOOTX_TEXT) += btext.o 34 34 35 35 ifeq ($(CONFIG_PPC_ISERIES),y) 36 - arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s 37 - AFLAGS_head_64.o += -Iarch/powerpc/platforms/iseries 36 + $(obj)/head_64.o: $(obj)/lparmap.s 37 + AFLAGS_head_64.o += -I$(obj) 38 + endif 38 39 endif
arch/powerpc/platforms/iseries/lparmap.c arch/powerpc/kernel/lparmap.c
+2 -2
arch/ppc64/kernel/Makefile
··· 70 70 71 71 ifneq ($(CONFIG_PPC_MERGE),y) 72 72 ifeq ($(CONFIG_PPC_ISERIES),y) 73 - arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s 74 - AFLAGS_head.o += -Iarch/powerpc/platforms/iseries 73 + arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s 74 + AFLAGS_head.o += -Iarch/powerpc/kernel 75 75 endif 76 76 endif