From a55a62e370ce86b6cad4e2187e6594c80be7d8dc Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Fri, 11 Jan 2008 14:02:47 +1100
Subject: [PATCH] --- yaml --- r: 75415 b: refs/heads/master c:
 473980a99316c0e788bca50996375a2815124ce1 h: refs/heads/master i:   75413:
 df76db9ace1c788edc8e3aaee4a46a2cd4a6cb77   75411:
 d6c4144b4a0a114a1860695a3f317d24b3c32344   75407:
 3dbeb97efa28b485ef64d00eae6d5ac93cc2ed14 v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/powerpc/mm/slb.c                        | 8 ++++++++
 trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 ++
 trunk/arch/powerpc/platforms/pseries/lpar.c        | 1 +
 trunk/include/asm-powerpc/mmu-hash64.h             | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3637ab336e3f..23f6c40fc64f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f4347c969674ed45de7d08d4b26d6326a95b959
+refs/heads/master: 473980a99316c0e788bca50996375a2815124ce1
diff --git a/trunk/arch/powerpc/mm/slb.c b/trunk/arch/powerpc/mm/slb.c
index 27922dff8b94..a282bc212e80 100644
--- a/trunk/arch/powerpc/mm/slb.c
+++ b/trunk/arch/powerpc/mm/slb.c
@@ -82,6 +82,14 @@ static inline void slb_shadow_clear(unsigned long entry)
 	get_slb_shadow()->save_area[entry].esid = 0;
 }
 
+void slb_shadow_clear_all(void)
+{
+	int i;
+
+	for (i = 0; i < SLB_NUM_BOLTED; i++)
+		slb_shadow_clear(i);
+}
+
 static inline void create_shadowed_slbe(unsigned long ea, int ssize,
 					unsigned long flags,
 					unsigned long entry)
diff --git a/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c b/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c
index fc48b96c81bf..412e6b42986f 100644
--- a/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/trunk/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -29,6 +29,7 @@
 #include <asm/vdso_datapage.h>
 #include <asm/pSeries_reconfig.h>
 #include "xics.h"
+#include "plpar_wrappers.h"
 
 /* This version can't take the spinlock, because it never returns */
 static struct rtas_args rtas_stop_self_args = {
@@ -58,6 +59,7 @@ static void pseries_mach_cpu_die(void)
 	local_irq_disable();
 	idle_task_exit();
 	xics_teardown_cpu(0);
+	unregister_slb_shadow(hard_smp_processor_id(), __pa(get_slb_shadow()));
 	rtas_stop_self();
 	/* Should never get here... */
 	BUG();
diff --git a/trunk/arch/powerpc/platforms/pseries/lpar.c b/trunk/arch/powerpc/platforms/pseries/lpar.c
index 9a455d46379d..34317aa148a8 100644
--- a/trunk/arch/powerpc/platforms/pseries/lpar.c
+++ b/trunk/arch/powerpc/platforms/pseries/lpar.c
@@ -272,6 +272,7 @@ void vpa_init(int cpu)
 	 */
 	addr = __pa(&slb_shadow[cpu]);
 	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
+		slb_shadow_clear_all();
 		ret = register_slb_shadow(hwcpu, addr);
 		if (ret)
 			printk(KERN_ERR
diff --git a/trunk/include/asm-powerpc/mmu-hash64.h b/trunk/include/asm-powerpc/mmu-hash64.h
index 82328dec2b52..951e2487aa69 100644
--- a/trunk/include/asm-powerpc/mmu-hash64.h
+++ b/trunk/include/asm-powerpc/mmu-hash64.h
@@ -286,6 +286,7 @@ extern void hpte_init_iSeries(void);
 extern void hpte_init_beat(void);
 extern void hpte_init_beat_v3(void);
 
+extern void slb_shadow_clear_all(void);
 extern void stabs_alloc(void);
 extern void slb_initialize(void);
 extern void slb_flush_and_rebolt(void);