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

Commit 7f00a249 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/core

parents c58603e8 71ff49d7 5f641356 65c24491

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -567,6 +567,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) 
# disable pointer signed / unsigned warnings in gcc 4.0

KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)



# disable invalid "can't wrap" optimzations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fwrapv)



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# But warn user when we do so

warn-assign = \

arch/powerpc/configs/ps3_defconfig

+190 −60

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/include/asm/cputable.h

+3 −1
Original line number Diff line number Diff line
@@ -241,9 +241,11 @@ extern const char *powerpc_base_platform; 
/* We need to mark all pages as being coherent if we're SMP or we have a

 * 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II

 * require it for PCI "streaming/prefetch" to work properly.

 * This is also required by 52xx family.

 */

#if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \

	|| defined(CONFIG_PPC_83xx) || defined(CONFIG_8260)

	|| defined(CONFIG_PPC_83xx) || defined(CONFIG_8260) \

	|| defined(CONFIG_PPC_MPC52xx)

#define CPU_FTR_COMMON                  CPU_FTR_NEED_COHERENT

#else

#define CPU_FTR_COMMON                  0

arch/powerpc/kernel/head_32.S

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ InstructionTLBMiss: 
	and	r1,r1,r2		/* writable if _RW and _DIRTY */

	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	rlwimi	r3,r3,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe14		/* clear out reserved bits and M */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r3,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_IMISS
@@ -585,7 +585,7 @@ DataLoadTLBMiss: 
	and	r1,r1,r2		/* writable if _RW and _DIRTY */

	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	rlwimi	r3,r3,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe14		/* clear out reserved bits and M */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r3,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_DMISS
@@ -653,7 +653,7 @@ DataStoreTLBMiss: 
	stw	r3,0(r2)		/* update PTE (accessed/dirty bits) */

	/* Convert linux-style PTE to low word of PPC-style PTE */

	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	li	r1,0xe15		/* clear out reserved bits and M */

	li	r1,0xe05		/* clear out reserved bits & PP lsb */

	andc	r1,r3,r1		/* PP = user? 2: 0 */

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_DMISS

arch/powerpc/platforms/ps3/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,13 @@ config PS3_FLASH 
	  be disabled on the kernel command line using "ps3flash=off", to

	  not allocate this fixed buffer.



config PS3_VRAM

	tristate "PS3 Video RAM Storage Driver"

	depends on FB_PS3=y && BLOCK && m

	help

	  This driver allows you to use excess PS3 video RAM as volatile

	  storage or system swap.



config PS3_LPM

	tristate "PS3 Logical Performance Monitor support"

	depends on PPC_PS3