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

Commit 64a3dcd5 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] ehea: Remove dependency on MEMORY_HOTPLUG
  [POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n
  [POWERPC] Use dev_set_name in pci_64.c
  [POWERPC] Fix incorrect enabling of VMX when building signal or user context
  [POWERPC] boot/Makefile CONFIG_ variable fixes
parents 53207293 60d5019b

arch/powerpc/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ image-$(CONFIG_WARP) += cuImage.warp 
image-$(CONFIG_YOSEMITE)		+= cuImage.yosemite



# Board ports in arch/powerpc/platform/8xx/Kconfig

image-$(CONFIG_PPC_MPC86XADS)		+= cuImage.mpc866ads

image-$(CONFIG_PPC_MPC885ADS)		+= cuImage.mpc885ads

image-$(CONFIG_MPC86XADS)		+= cuImage.mpc866ads

image-$(CONFIG_MPC885ADS)		+= cuImage.mpc885ads

image-$(CONFIG_PPC_EP88XC)		+= dtbImage.ep88xc

image-$(CONFIG_PPC_ADDER875)		+= cuImage.adder875-uboot \

					   dtbImage.adder875-redboot

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 


	dev->cfg_size = pci_cfg_space_size(dev);



	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),

	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus),

		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));

	dev->class = get_int_prop(node, "class-code", 0);

	dev->revision = get_int_prop(node, "revision-id", 0);

arch/powerpc/kernel/signal_64.c

+3 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 
#ifdef CONFIG_ALTIVEC

	elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve + 15) & ~0xful);

#endif

	unsigned long msr = regs->msr;

	long err = 0;



	flush_fp_to_thread(current);
@@ -102,7 +103,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 
		/* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg)

		 * contains valid data.

		 */

		regs->msr |= MSR_VEC;

		msr |= MSR_VEC;

	}

	/* We always copy to/from vrsave, it's 0 if we don't have or don't

	 * use altivec.
@@ -114,6 +115,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 
	err |= __put_user(&sc->gp_regs, &sc->regs);

	WARN_ON(!FULL_REGS(regs));

	err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE);

	err |= __put_user(msr, &sc->gp_regs[PT_MSR]);

	err |= __copy_to_user(&sc->fp_regs, &current->thread.fpr, FP_REGS_SIZE);

	err |= __put_user(signr, &sc->signal);

	err |= __put_user(handler, &sc->handler);

arch/powerpc/mm/mem.c

+1 −2
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ out: 
	return ret;

}

#endif /* CONFIG_MEMORY_HOTREMOVE */

#endif /* CONFIG_MEMORY_HOTPLUG */



/*

 * walk_memory_resource() needs to make sure there is no holes in a given
@@ -184,8 +185,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, 
}

EXPORT_SYMBOL_GPL(walk_memory_resource);



#endif /* CONFIG_MEMORY_HOTPLUG */



void show_mem(void)

{

	unsigned long total = 0, reserved = 0;

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2426,7 +2426,7 @@ config CHELSIO_T3 


config EHEA

	tristate "eHEA Ethernet support"

	depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG

	depends on IBMEBUS && INET && SPARSEMEM

	select INET_LRO

	---help---

	  This driver supports the IBM pSeries eHEA ethernet adapter.