aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-01-15 01:29:33 -0500
committerPaul Mackerras <paulus@samba.org>2008-01-15 01:30:58 -0500
commitdfbe0d3b6be52596b5694b1bb75b19562e769021 (patch)
tree75e3ef05b6dd8cc7065fe77a05a9cd1b3495619a /include
parentd262c32a4bcc3e5fda0325a64e53c25fe1e999d7 (diff)
[POWERPC] Fix boot failure on POWER6
Commit 473980a99316c0e788bca50996375a2815124ce1 added a call to clear the SLB shadow buffer before registering it. Unfortunately this means that we clear out the entries that slb_initialize has previously set in there. On POWER6, the hypervisor uses the SLB shadow buffer when doing partition switches, and that means that after the next partition switch, each non-boot CPU has no SLB entries to map the kernel text and data, which causes it to crash. This fixes it by reverting most of 473980a9 and instead clearing the 3rd entry explicitly in slb_initialize. This fixes the problem that 473980a9 was trying to solve, but without breaking POWER6. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/mmu-hash64.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h
index 951e2487aa69..82328dec2b52 100644
--- a/include/asm-powerpc/mmu-hash64.h
+++ b/include/asm-powerpc/mmu-hash64.h
@@ -286,7 +286,6 @@ extern void hpte_init_iSeries(void);
286extern void hpte_init_beat(void); 286extern void hpte_init_beat(void);
287extern void hpte_init_beat_v3(void); 287extern void hpte_init_beat_v3(void);
288 288
289extern void slb_shadow_clear_all(void);
290extern void stabs_alloc(void); 289extern void stabs_alloc(void);
291extern void slb_initialize(void); 290extern void slb_initialize(void);
292extern void slb_flush_and_rebolt(void); 291extern void slb_flush_and_rebolt(void);