Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c29970c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] ppc: More compile fixes
  [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
  [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
  [POWERPC] ppc: Use ebony_defconfig for defconfig
  [POWERPC] Fix default cputable entries for e200 and e500 families
parents 59b1c825 0d4b6b90

arch/powerpc/kernel/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ PHONY += systbl_chk 
systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i

	$(call cmd,systbl_chk)





ifeq ($(CONFIG_PPC_MERGE),y)



$(obj)/built-in.o:		prom_init_check



quiet_cmd_prom_init_check = CALL    $<
@@ -114,4 +117,7 @@ PHONY += prom_init_check 
prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o

	$(call cmd,prom_init_check)



endif





clean-files := vmlinux.lds

arch/powerpc/kernel/cputable.c

+2 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,7 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.dcache_bsize		= 32,

		.machine_check		= machine_check_e200,

		.platform		= "ppc5554",

	}

#endif /* CONFIG_E200 */

#ifdef CONFIG_E500

	{	/* e500 */
@@ -1533,6 +1534,7 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.dcache_bsize		= 32,

		.machine_check		= machine_check_e500,

		.platform		= "powerpc",

	}

#endif /* CONFIG_E500 */

#endif /* CONFIG_PPC32 */

};

arch/powerpc/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ ifeq ($(CONFIG_PPC_MERGE),y) 
obj-y			:= string.o alloc.o \

			   checksum_$(CONFIG_WORD_SIZE).o

obj-$(CONFIG_PPC32)	+= div64.o copy_32.o

obj-$(CONFIG_HAS_IOMEM)	+= devres.o

endif



obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
@@ -23,4 +24,3 @@ obj-$(CONFIG_SMP) += locks.o 
endif



obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
 
obj-$(CONFIG_HAS_IOMEM)	+= devres.o

arch/ppc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ KBUILD_AFLAGS += $(cpu-as-y) 
KBUILD_CFLAGS += $(cpu-as-y)



# Default to the common case.

KBUILD_DEFCONFIG := common_defconfig

KBUILD_DEFCONFIG := ebony_defconfig



head-y				:= arch/ppc/kernel/head.o

head-$(CONFIG_8xx)		:= arch/ppc/kernel/head_8xx.o

arch/ppc/kernel/ppc_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/checksum.h>

#include <asm/pgtable.h>

#include <asm/tlbflush.h>

#include <asm/cacheflush.h>

#include <linux/adb.h>

#include <linux/cuda.h>

#include <linux/pmu.h>