X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-powerpc%2Flppaca.h;h=4dc514aabfe7e8170c3820b587e260b3d6dd5131;hb=638ebcc81f40b160f5e8b161e690e9b1b9503c1e;hp=c1bedab1515bad821642ee28d5f7cbee2e0383bd;hpb=e130bedb7ce718a8eb6b56a3806b96281f618111;p=linux-2.6

diff --git a/include/asm-powerpc/lppaca.h b/include/asm-powerpc/lppaca.h
index c1bedab151..4dc514aabf 100644
--- a/include/asm-powerpc/lppaca.h
+++ b/include/asm-powerpc/lppaca.h
@@ -18,6 +18,7 @@
  */
 #ifndef _ASM_POWERPC_LPPACA_H
 #define _ASM_POWERPC_LPPACA_H
+#ifdef __KERNEL__
 
 //=============================================================================
 //
@@ -28,6 +29,8 @@
 //----------------------------------------------------------------------------
 #include <asm/types.h>
 
+/* The Hypervisor barfs if the lppaca crosses a page boundary.  A 1k
+ * alignment is sufficient to prevent this */
 struct lppaca {
 //=============================================================================
 // CACHE_LINE_1 0x0000 - 0x007F Contains read-only data
@@ -126,6 +129,9 @@ struct lppaca {
 // CACHE_LINE_4-5 0x0100 - 0x01FF Contains PMC interrupt data
 //=============================================================================
 	u8	pmc_save_area[256];	// PMC interrupt Area           x00-xFF
-};
+} __attribute__((__aligned__(0x400)));
 
+extern struct lppaca lppaca[];
+
+#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_LPPACA_H */