Merge to Fedora kernel-2.6.18-1.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...

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

diff --git a/include/asm-ppc64/systemcfg.h b/include/asm-ppc64/systemcfg.h
index b7d6e0f..9b86b53 100644 (file)
--- a/include/asm-ppc64/systemcfg.h
+++ b/include/asm-ppc64/systemcfg.h
@@ -15,23 +15,19 @@
  * End Change Activity 
  */
 
-
-#ifndef __KERNEL__
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <linux/types.h>
-#endif
-
 /*
  * If the major version changes we are incompatible.
  * Minor version changes are a hint.
  */
 #define SYSTEMCFG_MAJOR 1
-#define SYSTEMCFG_MINOR 0
+#define SYSTEMCFG_MINOR 1
 
 #ifndef __ASSEMBLY__
 
+#include <linux/unistd.h>
+
+#define SYSCALL_MAP_SIZE      ((__NR_syscalls + 31) / 32)
+
 struct systemcfg {
        __u8  eye_catcher[16];          /* Eyecatcher: SYSTEMCFG:PPC64  0x00 */
        struct {                        /* Systemcfg version numbers         */
@@ -50,11 +46,13 @@ struct systemcfg {
        __u64 tb_update_count;          /* Timebase atomicity ctr       0x50 */
        __u32 tz_minuteswest;           /* Minutes west of Greenwich    0x58 */
        __u32 tz_dsttime;               /* Type of dst correction       0x5C */
-       __u32 dCacheL1Size;             /* L1 d-cache size              0x60 */
-       __u32 dCacheL1LineSize;         /* L1 d-cache line size         0x64 */
-       __u32 iCacheL1Size;             /* L1 i-cache size              0x68 */
-       __u32 iCacheL1LineSize;         /* L1 i-cache line size         0x6C */
-       __u8  reserved0[3984];          /* Reserve rest of page         0x70 */
+       /* next four are no longer used except to be exported to /proc */
+       __u32 dcache_size;              /* L1 d-cache size              0x60 */
+       __u32 dcache_line_size;         /* L1 d-cache line size         0x64 */
+       __u32 icache_size;              /* L1 i-cache size              0x68 */
+       __u32 icache_line_size;         /* L1 i-cache line size         0x6C */
+       __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of available syscalls 0x70 */
+       __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of available syscalls */
 };
 
 #ifdef __KERNEL__
@@ -63,8 +61,4 @@ extern struct systemcfg *systemcfg;
 
 #endif /* __ASSEMBLY__ */
 
-#define SYSTEMCFG_PAGE      0x5
-#define SYSTEMCFG_PHYS_ADDR (SYSTEMCFG_PAGE<<PAGE_SHIFT)
-#define SYSTEMCFG_VIRT_ADDR (KERNELBASE+SYSTEMCFG_PHYS_ADDR)
-
 #endif /* _SYSTEMCFG_H */