Commit 03cfdb86 authored Nov 30, 2008 by Linus Torvalds

powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix system calls on Cell entered with XER.SO=1
  powerpc/cell: Fix GDB watchpoints, again
  powerpc/mpic: Don't reset affinity for secondary MPIC on boot
  powerpc/cell/axon-msi: Retry on missing interrupt
  powerpc: Fix boot freeze on machine with empty memory node
  powerpc: Fix IRQ assignment for some PCIe devices
  powerpc/spufs: Fix spinning in spufs_ps_fault on signal
  powerpc/mpc832x_rdb: fix swapped ethernet ids
  powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610
  powerpc/85xx: L2 cache size wrong in 8572DS dts
  powerpc/virtex: Update defconfigs
  powerpc/52xx: update defconfigs
  xsysace: Fix driver to use resource_size_t instead of unsigned long
  powerpc/virtex: fix various format/casting printk mismatches
  powerpc/mpc5200: fix bestcomm Kconfig dependencies
  powerpc/44x: Fix 460EX/460GT machine check handling
  powerpc/40x: Limit allocable DRAM during early mapping

parents 4ec8f077 ab598b66

arch/powerpc/boot/dts/mpc832x_rdb.dts

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,8 @@
	#size-cells = <1>;		#size-cells = <1>;

	aliases {		aliases {
	ethernet0 = &enet0;		ethernet0 = &enet1;
	ethernet1 = &enet1;		ethernet1 = &enet0;
	serial0 = &serial0;		serial0 = &serial0;
	serial1 = &serial1;		serial1 = &serial1;
	pci0 = &pci0;		pci0 = &pci0;

arch/powerpc/boot/dts/mpc8572ds.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,7 @@
	compatible = "fsl,mpc8572-l2-cache-controller";		compatible = "fsl,mpc8572-l2-cache-controller";
	reg = <0x20000 0x1000>;		reg = <0x20000 0x1000>;
	cache-line-size = <32>; // 32 bytes		cache-line-size = <32>; // 32 bytes
	cache-size = <0x80000>; // L2, 512K		cache-size = <0x100000>; // L2, 1M
	interrupt-parent = <&mpic>;		interrupt-parent = <&mpic>;
	interrupts = <16 2>;		interrupts = <16 2>;
	};		};

Admin message