Commit 95237b80 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: Fix failure to shutdown with CPU hotplug
  powerpc: Fix PCI in Holly device tree
parents cf4b0b2c 61e9916e

arch/powerpc/boot/dts/holly.dts

+53 −53
Original line number Diff line number Diff line
@@ -133,14 +133,15 @@ MPIC: pic@7400 { 
			reg = <0x00007400 0x00000400>;

			big-endian;

		};

	};



		pci@1000 {

	pci@c0001000 {

		device_type = "pci";

		compatible = "tsi109-pci", "tsi108-pci";

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

			reg = <0x00001000 0x00001000>;

		reg = <0xc0001000 0x00001000>;

		bus-range = <0x0 0x0>;

		/*----------------------------------------------------+

		| PCI memory range.
@@ -189,7 +190,6 @@ RT0: router@1180 { 
			interrupt-parent = <&MPIC>;

		};

	};

	};



	chosen {

		linux,stdout-path = "/tsi109@c0000000/serial@7808";

arch/powerpc/kernel/idle.c

+1 −5
Original line number Diff line number Diff line
@@ -34,11 +34,7 @@ 
#include <asm/smp.h>



#ifdef CONFIG_HOTPLUG_CPU

/* this is used for software suspend, and that shuts down

 * CPUs even while the system is still booting... */

#define cpu_should_die()	(cpu_is_offline(smp_processor_id()) && \

				   (system_state == SYSTEM_RUNNING     \

				 || system_state == SYSTEM_BOOTING))

#define cpu_should_die()	cpu_is_offline(smp_processor_id())

#else

#define cpu_should_die()	0

#endif