vserver 1.9.5.x5

[linux-2.6.git] / include / asm-ppc64 / naca.h

diff --git a/include/asm-ppc64/naca.h b/include/asm-ppc64/naca.h
index 0454184..bfb7caa 100644 (file)
--- a/include/asm-ppc64/naca.h
+++ b/include/asm-ppc64/naca.h
@@ -11,41 +11,21 @@
  */
 
 #include <asm/types.h>
-#include <asm/systemcfg.h>
 
 #ifndef __ASSEMBLY__
 
 struct naca_struct {
-       /*==================================================================
-        * Cache line 1: 0x0000 - 0x007F
-        * Kernel only data - undefined for user space
-        *==================================================================
-        */
+       /* Kernel only data - undefined for user space */
        void *xItVpdAreas;              /* VPD Data                  0x00 */
        void *xRamDisk;                 /* iSeries ramdisk           0x08 */
        u64   xRamDiskSize;             /* In pages                  0x10 */
-       struct paca_struct *paca;       /* Ptr to an array of pacas  0x18 */
-       u64 debug_switch;               /* Debug print control       0x20 */
-       u64 banner;                     /* Ptr to banner string      0x28 */
-       u64 log;                        /* Ptr to log buffer         0x30 */
-       u64 serialPortAddr;             /* Phy addr of serial port   0x38 */
-       u64 interrupt_controller;       /* Type of int controller    0x40 */ 
-       u64 unused1;                    /* was SLB size in entries   0x48 */
-       u64 pftSize;                    /* Log 2 of page table size  0x50 */
-       void *systemcfg;                /* Pointer to systemcfg data 0x58 */
-       u32 dCacheL1LogLineSize;        /* L1 d-cache line size Log2 0x60 */
-       u32 dCacheL1LinesPerPage;       /* L1 d-cache lines / page   0x64 */
-       u32 iCacheL1LogLineSize;        /* L1 i-cache line size Log2 0x68 */
-       u32 iCacheL1LinesPerPage;       /* L1 i-cache lines / page   0x6c */
-       u8  resv0[15];                  /* Reserved           0x71 - 0x7F */
 };
 
-extern struct naca_struct *naca;
+extern struct naca_struct naca;
 
 #endif /* __ASSEMBLY__ */
 
 #define NACA_PAGE      0x4
 #define NACA_PHYS_ADDR (NACA_PAGE<<PAGE_SHIFT)
-#define NACA_VIRT_ADDR (KERNELBASE+NACA_PHYS_ADDR)
 
 #endif /* _NACA_H */