update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / include / asm-ppc64 / mmu.h

diff --git a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h
index 3b66f32..353b3db 100644 (file)
--- a/include/asm-ppc64/mmu.h
+++ b/include/asm-ppc64/mmu.h
@@ -37,33 +37,17 @@ typedef struct {
                mm_context_t ctx = { .id = REGION_ID(ea), KERNEL_LOW_HPAGES}; \
                ctx; })
 
-typedef struct {
-       unsigned long esid: 36; /* Effective segment ID */
-       unsigned long resv0:20; /* Reserved */
-       unsigned long v:     1; /* Entry valid (v=1) or invalid */
-       unsigned long resv1: 1; /* Reserved */
-       unsigned long ks:    1; /* Supervisor (privileged) state storage key */
-       unsigned long kp:    1; /* Problem state storage key */
-       unsigned long n:     1; /* No-execute if n=1 */
-       unsigned long resv2: 3; /* padding to a 64b boundary */
-} ste_dword0;
+#define STE_ESID_V     0x80
+#define STE_ESID_KS    0x20
+#define STE_ESID_KP    0x10
+#define STE_ESID_N     0x08
 
-typedef struct {
-       unsigned long vsid: 52; /* Virtual segment ID */
-       unsigned long resv0:12; /* Padding to a 64b boundary */
-} ste_dword1;
+#define STE_VSID_SHIFT 12
 
-typedef struct _STE {
-       union {
-               unsigned long dword0;
-               ste_dword0    dw0;
-       } dw0;
-
-       union {
-               unsigned long dword1;
-               ste_dword1    dw1;
-       } dw1;
-} STE;
+struct stab_entry {
+       unsigned long esid_data;
+       unsigned long vsid_data;
+};
 
 /* Hardware Page Table Entry */