diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 21:20:46 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 21:23:17 +0100 |
| commit | 5e45a0a1975df83fc068349e6a31fdf6af61a458 (patch) | |
| tree | a8e229f1f5d39e15dac0cb38090e5e06d6602224 | |
| parent | bca7a5a04933700a8bde4ea5798119607a8b0436 (diff) | |
| parent | 73053d973dd6f56472309cffa5a5d15a62dd6f96 (diff) | |
| download | olio-linux-3.10-5e45a0a1975df83fc068349e6a31fdf6af61a458.tar.xz olio-linux-3.10-5e45a0a1975df83fc068349e6a31fdf6af61a458.zip | |
Merge commit '73053d973' into smp-hotplug
This is to fix a merge problem with mach-highbank/hotplug.c, which git
silently resolves, but wrongly. This commit contains the correct
resolution.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-highbank/hotplug.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c index 35dd42e2168..a019e4e86e5 100644 --- a/arch/arm/mach-highbank/hotplug.c +++ b/arch/arm/mach-highbank/hotplug.c @@ -14,6 +14,7 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/kernel.h> +#include <asm/cacheflush.h> #include "core.h" #include "sysregs.h" @@ -27,10 +28,10 @@ extern void secondary_startup(void); void __ref highbank_cpu_die(unsigned int cpu) { highbank_set_cpu_jump(cpu, phys_to_virt(0)); - highbank_set_core_pwr(); - cpu_do_idle(); + flush_cache_louis(); + highbank_set_core_pwr(); - /* We should never return from idle */ - panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu); + while (1) + cpu_do_idle(); } |