Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[linux-2.6-omap-h63xx.git] / include / asm-s390 / lowcore.h

diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
index 801a6fd35b5be34c1963e17ef59aae4c6379df95..5de3efb31445a88f986a1e5480b059088042d520 100644 (file)
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
@@ -56,6 +56,8 @@
 #define __LC_IO_INT_WORD                0x0C0
 #define __LC_MCCK_CODE                  0x0E8
 
+#define __LC_LAST_BREAK                0x110
+
 #define __LC_RETURN_PSW                 0x200
 
 #define __LC_SAVE_AREA                  0xC00
@@ -80,7 +82,6 @@
 #define __LC_CPUID                      0xC60
 #define __LC_CPUADDR                    0xC68
 #define __LC_IPLDEV                     0xC7C
-#define __LC_JIFFY_TIMER               0xC80
 #define __LC_CURRENT                   0xC90
 #define __LC_INT_CLOCK                 0xC98
 #else /* __s390x__ */
@@ -103,7 +104,6 @@
 #define __LC_CPUID                     0xD80
 #define __LC_CPUADDR                   0xD88
 #define __LC_IPLDEV                     0xDB8
-#define __LC_JIFFY_TIMER               0xDC0
 #define __LC_CURRENT                   0xDD8
 #define __LC_INT_CLOCK                 0xDE8
 #endif /* __s390x__ */
@@ -276,7 +276,7 @@ struct _lowcore
        /* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
-        __u64        jiffy_timer;              /* 0xc80 */
+       __u64        clock_comparator;         /* 0xc80 */
        __u32        ext_call_fast;            /* 0xc88 */
        __u32        percpu_offset;            /* 0xc8c */
        __u32        current_task;             /* 0xc90 */
@@ -368,11 +368,12 @@ struct _lowcore
        /* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
-        __u64        jiffy_timer;              /* 0xdc0 */
+       __u64        clock_comparator;         /* 0xdc0 */
        __u64        ext_call_fast;            /* 0xdc8 */
        __u64        percpu_offset;            /* 0xdd0 */
        __u64        current_task;             /* 0xdd8 */
-       __u64        softirq_pending;          /* 0xde0 */
+       __u32        softirq_pending;          /* 0xde0 */
+       __u32        pad_0x0de4;               /* 0xde4 */
        __u64        int_clock;                /* 0xde8 */
         __u8         pad12[0xe00-0xdf0];       /* 0xdf0 */