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

Commit 37a08b13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/pci: Fix MODPOST warning
  powerpc/oprofile: Add ppc750 CL as supported by oprofile
  powerpc: warning: allocated section `.data_nosave' not in segment
  powerpc/kgdb: Fix build failure caused by "kgdb.c: unused variable 'acc'"
  powerpc: Fix hypervisor TLB batching
  powerpc/mm: Fix hang accessing top of vmalloc space
  powerpc: Fix memory leak in axon_msi.c
  powerpc/pmac: Fix issues with sleep on some powerbooks
  powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler
  powerpc/ftrace: show real return addresses in modules
parents bd72f85b b734dd5b

arch/powerpc/include/asm/firmware.h

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define FW_FEATURE_VIO		ASM_CONST(0x0000000000004000)

#define FW_FEATURE_RDMA		ASM_CONST(0x0000000000008000)

#define FW_FEATURE_LLAN		ASM_CONST(0x0000000000010000)

#define FW_FEATURE_BULK		ASM_CONST(0x0000000000020000)

#define FW_FEATURE_BULK_REMOVE	ASM_CONST(0x0000000000020000)

#define FW_FEATURE_XDABR	ASM_CONST(0x0000000000040000)

#define FW_FEATURE_MULTITCE	ASM_CONST(0x0000000000080000)

#define FW_FEATURE_SPLPAR	ASM_CONST(0x0000000000100000)
@@ -45,8 +45,7 @@ 
#define FW_FEATURE_LPAR		ASM_CONST(0x0000000000400000)

#define FW_FEATURE_PS3_LV1	ASM_CONST(0x0000000000800000)

#define FW_FEATURE_BEAT		ASM_CONST(0x0000000001000000)

#define FW_FEATURE_BULK_REMOVE	ASM_CONST(0x0000000002000000)

#define FW_FEATURE_CMO		ASM_CONST(0x0000000004000000)

#define FW_FEATURE_CMO		ASM_CONST(0x0000000002000000)



#ifndef __ASSEMBLY__
@@ -58,8 +57,9 @@ enum { 
		FW_FEATURE_PERF | FW_FEATURE_DUMP | FW_FEATURE_INTERRUPT |

		FW_FEATURE_MIGRATE | FW_FEATURE_PERFMON | FW_FEATURE_CRQ |

		FW_FEATURE_VIO | FW_FEATURE_RDMA | FW_FEATURE_LLAN |

		FW_FEATURE_BULK | FW_FEATURE_XDABR | FW_FEATURE_MULTITCE |

		FW_FEATURE_SPLPAR | FW_FEATURE_LPAR | FW_FEATURE_CMO,

		FW_FEATURE_BULK_REMOVE | FW_FEATURE_XDABR |

		FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR |

		FW_FEATURE_CMO,

	FW_FEATURE_PSERIES_ALWAYS = 0,

	FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,

	FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,

arch/powerpc/kernel/cputable.c

+2 −0
Original line number Diff line number Diff line
@@ -711,6 +711,8 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.cpu_setup		= __setup_cpu_750,

		.machine_check		= machine_check_generic,

		.platform		= "ppc750",

		.oprofile_cpu_type      = "ppc/750",

		.oprofile_type		= PPC_OPROFILE_G4,

	},

	{	/* 745/755 */

		.pvr_mask		= 0xfffff000,

arch/powerpc/kernel/entry_64.S

+1 −2
Original line number Diff line number Diff line
@@ -1038,8 +1038,7 @@ _GLOBAL(mod_return_to_handler) 
	 * We are in a module using the module's TOC.

	 * Switch to our TOC to run inside the core kernel.

	 */

	LOAD_REG_IMMEDIATE(r4,ftrace_return_to_handler)

	ld	r2, 8(r4)

	ld	r2, PACATOC(r13)



	bl	.ftrace_return_to_handler

	nop

arch/powerpc/kernel/kgdb.c

+0 −6
Original line number Diff line number Diff line
@@ -282,12 +282,6 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs) 
{

	unsigned long *ptr = gdb_regs;

	int reg;

#ifdef CONFIG_SPE

	union {

		u32 v32[2];

		u64 v64;

	} acc;

#endif



	for (reg = 0; reg < 32; reg++)

		UNPACK64(regs->gpr[reg], ptr);

arch/powerpc/kernel/pci-common.c

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ EXPORT_SYMBOL(pcibios_align_resource); 
 * Reparent resource children of pr that conflict with res

 * under res, and make res replace those children.

 */

static int __init reparent_resources(struct resource *parent,

static int reparent_resources(struct resource *parent,

				     struct resource *res)

{

	struct resource *p, **pp;