Commit bc6f8a4b authored Oct 10, 2005 by Paul Mackerras

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>

parent 5a408329

arch/powerpc/kernel/Makefile

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
	obj-$(CONFIG_BOOTX_TEXT) += btext.o		obj-$(CONFIG_BOOTX_TEXT) += btext.o

	ifeq ($(CONFIG_PPC_ISERIES),y)		ifeq ($(CONFIG_PPC_ISERIES),y)
	arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s		$(obj)/head_64.o: $(obj)/lparmap.s
	AFLAGS_head_64.o += -Iarch/powerpc/platforms/iseries		AFLAGS_head_64.o += -I$(obj)
			endif
	endif		endif

arch/powerpc/platforms/iseries/lparmap.c→arch/powerpc/kernel/lparmap.c

+0 −0

File moved.

arch/ppc64/kernel/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,7 @@ CFLAGS_ioctl32.o += -Ifs/

	ifneq ($(CONFIG_PPC_MERGE),y)		ifneq ($(CONFIG_PPC_MERGE),y)
	ifeq ($(CONFIG_PPC_ISERIES),y)		ifeq ($(CONFIG_PPC_ISERIES),y)
	arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s		arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
	AFLAGS_head.o += -Iarch/powerpc/platforms/iseries		AFLAGS_head.o += -Iarch/powerpc/kernel
	endif		endif
	endif		endif