patch-2.4.21 linux-2.4.21/include/asm-ppc64/naca.h

• Lines: 62
• Date: 2003-06-13 07:51:38.000000000 -0700
• Orig file: linux-2.4.20/include/asm-ppc64/naca.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.20/include/asm-ppc64/naca.h linux-2.4.21/include/asm-ppc64/naca.h
@@ -11,6 +11,7 @@
  */
 
 #include <asm/types.h>
+#include <asm/systemcfg.h>
 
 struct naca_struct {
 	/*==================================================================
@@ -29,47 +30,14 @@
 	u64 interrupt_controller;	/* Type of int controller    0x40 */ 
 	u64 slb_size;			/* SLB size in entries       0x48 */
 	u64 pftSize;			/* Log 2 of page table size  0x50 */
-	u64 resv0[5];                   /* Reserved           0x58 - 0x7F */
-
-	/*==================================================================
-	 * Cache line 2: 0x0080 - 0x00FF
-	 * Kernel / User data
-	 *==================================================================
-	 */
-	u8  eye_catcher[6];             /* Eyecatcher: PPC64         0x00 */
-	u16 version;                    /* Version number            0x06 */
-	u16 platform;			/* Platform flags            0x08 */
-	u16 processor;			/* Processor type            0x0A */
-	u32 processorCount;		/* # of physical processors  0x0C */
-	u64 physicalMemorySize;		/* Size of real memory(B)    0x10 */
-
-	u16 dCacheL1Size;	        /* L1 d-cache size           0x18 */
-	u16 dCacheL1LineSize;		/* L1 d-cache line size      0x1A */
-	u16 dCacheL1LogLineSize;	/* L1 d-cache line size Log2 0x1C */
-	u16 dCacheL1LinesPerPage;	/* L1 d-cache lines / page   0x1E */
-	u16 dCacheL1Assoc;              /* L1 d-cache associativity  0x20 */
-
-	u16 iCacheL1Size;	        /* L1 i-cache size           0x22 */
-	u16 iCacheL1LineSize;		/* L1 i-cache line size      0x24 */
-	u16 iCacheL1LogLineSize;	/* L1 i-cache line size Log2 0x26 */
-	u16 iCacheL1LinesPerPage;	/* L1 i-cache lines / page   0x28 */
-	u16 iCacheL1Assoc;              /* L1 i-cache associativity  0x2A */
-
-	u16 cacheL2Size;	        /* L2 cache size             0x2C */
-	u16 cacheL2Assoc;	        /* L2 cache associativity    0x2E */
-
-	u64 tb_orig_stamp;              /* Timebase at boot          0x30 */
-	u64 tb_ticks_per_sec;           /* Timebase tics / sec       0x38 */
-	u64 tb_to_xs;                   /* Inverse of TB to 2^20     0x40 */
-	u64 stamp_xsec;                 /*                           0x48 */
-	volatile u64 tb_update_count;   /* Timebase atomicity ctr    0x50 */
-	u32 tz_minuteswest;             /* Minutes west of Greenwich 0x58 */
-	u32 tz_dsttime;                 /* Type of dst correction    0x5C */
-
-	u64 resv1[4];                   /* Reserverd          0x60 - 0x7F */
+	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 */
+	u64 resv0[2];                   /* Reserved           0x70 - 0x7F */
 };
 
-
 extern struct naca_struct *naca;
 
 #endif /* _NACA_H */