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

Commit 20f85957 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] Check for offline nodes in pci NUMA code
  [POWERPC] Better check in show_instructions
  [POWERPC] POWER6 has 6 PMCs
  [POWERPC] Never panic when taking altivec exceptions from userspace
  [POWERPC] Fix IO Window Updates on P2P bridges.
  [POWERPC] Add Makefile entry for MPC832x_mds support
  [POWERPC] Fix MPC8360EMDS PB board support
  [POWERPC] ppc: Add missing calls to set_irq_regs
  [POWERPC] Off-by-one in /arch/ppc/platforms/mpc8*
  [POWERPC] Add DOS partition table support to mpc834x_itx_defconfig
  [POWERPC] spufs: fix support for read/write on cntl
  [POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA
parents 7786ce19 284a9406

arch/powerpc/configs/mpc834x_itx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ CONFIG_PARTITION_ADVANCED=y 
# CONFIG_AMIGA_PARTITION is not set

# CONFIG_ATARI_PARTITION is not set

# CONFIG_MAC_PARTITION is not set

# CONFIG_MSDOS_PARTITION is not set

CONFIG_MSDOS_PARTITION=y

# CONFIG_LDM_PARTITION is not set

# CONFIG_SGI_PARTITION is not set

# CONFIG_ULTRIX_PARTITION is not set

arch/powerpc/kernel/cputable.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ struct cpu_spec cpu_specs[] = { 
		.cpu_user_features	= COMMON_USER_POWER6,

		.icache_bsize		= 128,

		.dcache_bsize		= 128,

		.num_pmcs		= 8,

		.num_pmcs		= 6,

		.oprofile_cpu_type	= "ppc64/power6",

		.oprofile_type		= PPC_OPROFILE_POWER4,

 		.oprofile_mmcra_sihv	= POWER6_MMCRA_SIHV,

arch/powerpc/kernel/pci_32.c

+6 −6
Original line number Diff line number Diff line
@@ -441,14 +441,14 @@ update_bridge_base(struct pci_bus *bus, int i) 
		end = res->end - off;

		io_base_lo = (start >> 8) & PCI_IO_RANGE_MASK;

		io_limit_lo = (end >> 8) & PCI_IO_RANGE_MASK;

		if (end > 0xffff) {

		if (end > 0xffff)

			io_base_lo |= PCI_IO_RANGE_TYPE_32;

		else

			io_base_lo |= PCI_IO_RANGE_TYPE_16;

		pci_write_config_word(dev, PCI_IO_BASE_UPPER16,

				start >> 16);

		pci_write_config_word(dev, PCI_IO_LIMIT_UPPER16,

				end >> 16);

			io_base_lo |= PCI_IO_RANGE_TYPE_32;

		} else

			io_base_lo |= PCI_IO_RANGE_TYPE_16;

		pci_write_config_byte(dev, PCI_IO_BASE, io_base_lo);

		pci_write_config_byte(dev, PCI_IO_LIMIT, io_limit_lo);

arch/powerpc/kernel/pci_64.c

+8 −2
Original line number Diff line number Diff line
@@ -199,8 +199,14 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev) 
	pci_setup_pci_controller(phb);

	phb->arch_data = dev;

	phb->is_dynamic = mem_init_done;

	if (dev)

		PHB_SET_NODE(phb, of_node_to_nid(dev));

	if (dev) {

		int nid = of_node_to_nid(dev);



		if (nid < 0 || !node_online(nid))

			nid = -1;



		PHB_SET_NODE(phb, nid);

	}

	return phb;

}

arch/powerpc/kernel/process.c

+2 −8
Original line number Diff line number Diff line
@@ -341,13 +341,6 @@ struct task_struct *__switch_to(struct task_struct *prev, 


static int instructions_to_print = 16;



#ifdef CONFIG_PPC64

#define BAD_PC(pc)	((REGION_ID(pc) != KERNEL_REGION_ID) && \

		         (REGION_ID(pc) != VMALLOC_REGION_ID))

#else

#define BAD_PC(pc)	((pc) < KERNELBASE)

#endif



static void show_instructions(struct pt_regs *regs)

{

	int i;
@@ -366,7 +359,8 @@ static void show_instructions(struct pt_regs *regs) 
		 * bad address because the pc *should* only be a

		 * kernel address.

		 */

		if (BAD_PC(pc) || __get_user(instr, (unsigned int __user *)pc)) {

		if (!__kernel_text_address(pc) ||

		     __get_user(instr, (unsigned int __user *)pc)) {

			printk("XXXXXXXX ");

		} else {

			if (regs->nip == pc)