Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / arch / s390 / include / asm / lowcore.h

diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 6bc9426a6fbf95b732d3d03a4c8397baa28ebd65..f2ef4b619ce1a7415966169b89b5cb3779b198ab 100644 (file)
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -86,6 +86,7 @@
 #define __LC_PGM_OLD_PSW               0x0150
 #define __LC_MCK_OLD_PSW               0x0160
 #define __LC_IO_OLD_PSW                        0x0170
+#define __LC_RESTART_PSW               0x01a0
 #define __LC_EXT_NEW_PSW               0x01b0
 #define __LC_SVC_NEW_PSW               0x01c0
 #define __LC_PGM_NEW_PSW               0x01d0
@@ -189,6 +190,14 @@ union save_area {
 #define SAVE_AREA_BASE SAVE_AREA_BASE_S390X
 #endif
 
+#ifndef __s390x__
+#define LC_ORDER 0
+#else
+#define LC_ORDER 1
+#endif
+
+#define LC_PAGES (1UL << LC_ORDER)
+
 struct _lowcore
 {
 #ifndef __s390x__