lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] smp: rename and add lowcore defines

Browse Source 
Rename __LC_RESTART_PSW to __LC_RST_NEW_PSW, add a define for the
missing 32 bit variant and the missing old PSWs.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
2010-02-26 22:37:33 +01:00
committed by Martin Schwidefsky
parent f64ca21714
commit abd1ecf209
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/s390/include/asm/lowcore.h
View File

@@ -36,6 +36,8 @@
#define __LC_DUMP_REIPL 0x0e00 #define __LC_DUMP_REIPL 0x0e00
#ifndef __s390x__ #ifndef __s390x__
#define __LC_RST_NEW_PSW 0x0000
#define __LC_RST_OLD_PSW 0x0008
#define __LC_EXT_OLD_PSW 0x0018 #define __LC_EXT_OLD_PSW 0x0018
#define __LC_SVC_OLD_PSW 0x0020 #define __LC_SVC_OLD_PSW 0x0020
#define __LC_PGM_OLD_PSW 0x0028 #define __LC_PGM_OLD_PSW 0x0028
@@ -81,12 +83,13 @@
#define __LC_CREGS_SAVE_AREA 0x01c0 #define __LC_CREGS_SAVE_AREA 0x01c0
#else /* __s390x__ */ #else /* __s390x__ */
#define __LC_LAST_BREAK 0x0110 #define __LC_LAST_BREAK 0x0110
#define __LC_RST_OLD_PSW 0x0120
#define __LC_EXT_OLD_PSW 0x0130 #define __LC_EXT_OLD_PSW 0x0130
#define __LC_SVC_OLD_PSW 0x0140 #define __LC_SVC_OLD_PSW 0x0140
#define __LC_PGM_OLD_PSW 0x0150 #define __LC_PGM_OLD_PSW 0x0150
#define __LC_MCK_OLD_PSW 0x0160 #define __LC_MCK_OLD_PSW 0x0160
#define __LC_IO_OLD_PSW 0x0170 #define __LC_IO_OLD_PSW 0x0170
#define __LC_RESTART_PSW 0x01a0 #define __LC_RST_NEW_PSW 0x01a0
#define __LC_EXT_NEW_PSW 0x01b0 #define __LC_EXT_NEW_PSW 0x01b0
#define __LC_SVC_NEW_PSW 0x01c0 #define __LC_SVC_NEW_PSW 0x01c0
#define __LC_PGM_NEW_PSW 0x01d0 #define __LC_PGM_NEW_PSW 0x01d0

2
arch/s390/kernel/swsusp_asm64.S
View File

@@ -176,7 +176,7 @@ pgm_check_entry:
cgr %r1,%r2 cgr %r1,%r2
je restore_registers /* r1 = r2 -> nothing to do */ je restore_registers /* r1 = r2 -> nothing to do */
larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */
mvc __LC_RESTART_PSW(16,%r0),0(%r4) mvc __LC_RST_NEW_PSW(16,%r0),0(%r4)
3: 3:
sigp %r9,%r1,__SIGP_INITIAL_CPU_RESET sigp %r9,%r1,__SIGP_INITIAL_CPU_RESET
brc 8,4f /* accepted */ brc 8,4f /* accepted */