patch-2.4.0-test6 linux/include/asm-s390/lowcore.h

Next file: linux/include/asm-s390/page.h
Previous file: linux/include/asm-s390/irq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-s390/lowcore.h linux/include/asm-s390/lowcore.h
@@ -41,9 +41,10 @@
 #define __LC_SAVE_AREA                  0xC00
 #define __LC_KERNEL_STACK               0xC40
 #define __LC_KERNEL_LEVEL               0xC44
-#define __LC_CPUID                      0xC50
-#define __LC_CPUADDR                    0xC58
-#define __LC_IPLDEV                     0xC6C
+#define __LC_IRQ_STAT                   0xC48
+#define __LC_CPUID                      0xC60
+#define __LC_CPUADDR                    0xC68
+#define __LC_IPLDEV                     0xC7C
 
 
 /* interrupt handler start with all io, external and mcck interrupt disabled */
@@ -145,19 +146,26 @@
 	__u32        save_area[16];            /* 0xc00 */
 	__u32        kernel_stack;             /* 0xc40 */
 	__u32        kernel_level;             /* 0xc44 */
-	atomic_t     local_bh_count;           /* 0xc48 */
-	atomic_t     local_irq_count;          /* 0xc4c */
-	struct       cpuinfo_S390 cpu_data;    /* 0xc50 */
-	__u32        ipl_device;               /* 0xc6c */
+	/* entry.S sensitive area start */
+	/* Next 6 words are the s390 equivalent of irq_stat */
+	__u32        __softirq_active;         /* 0xc48 */
+	__u32        __softirq_mask;           /* 0xc4c */
+	__u32        __local_irq_count;        /* 0xc50 */
+	__u32        __local_bh_count;         /* 0xc54 */
+	__u32        __syscall_count;          /* 0xc58 */
+	__u8         pad10[0xc60-0xc5c];       /* 0xc5c */
+	struct       cpuinfo_S390 cpu_data;    /* 0xc60 */
+	__u32        ipl_device;               /* 0xc7c */
+	/* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
-        __u64        jiffy_timer_cc;           /* 0xc70 */
-	atomic_t     ext_call_fast;            /* 0xc78 */
-	atomic_t     ext_call_queue;           /* 0xc7c */
-        atomic_t     ext_call_count;           /* 0xc80 */
+        __u64        jiffy_timer_cc;           /* 0xc80 */
+	atomic_t     ext_call_fast;            /* 0xc88 */
+	atomic_t     ext_call_queue;           /* 0xc8c */
+        atomic_t     ext_call_count;           /* 0xc90 */
 
         /* Align SMP info to the top 1k of prefix area */
-	__u8         pad10[0x1000-0xc84];      /* 0xc84 */
+	__u8         pad11[0x1000-0xc94];      /* 0xc94 */
 } __attribute__((packed)); /* End structure*/
 
 extern __inline__ void set_prefix(__u32 address)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)