summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/swsusp_asm64.S
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-08-29 19:36:49 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-08-30 08:57:15 +0200
commit77e844b9644026c11c5883144540155de39af767 (patch)
tree704f30cb7e9a30ade37e20c0f0bc9688f05ac0b0 /arch/s390/kernel/swsusp_asm64.S
parent0ff70ec88ba61f72b05b365a21fbd8aa60436254 (diff)
downloadop-kernel-dev-77e844b9644026c11c5883144540155de39af767.zip
op-kernel-dev-77e844b9644026c11c5883144540155de39af767.tar.gz
s390/hibernate: add early resume function
Some functions that do arch specific resume actions are called directly from swsusp_asm64.S . Before we add another function call provide a generic s390_early_resume function which can be used for this purpose. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/swsusp_asm64.S')
-rw-r--r--arch/s390/kernel/swsusp_asm64.S7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S
index c487be4..6b09fdf 100644
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
@@ -281,11 +281,8 @@ restore_registers:
lghi %r2,0
brasl %r14,arch_set_page_states
- /* Log potential guest relocation */
- brasl %r14,lgr_info_log
-
- /* Reinitialize the channel subsystem */
- brasl %r14,channel_subsystem_reinit
+ /* Call arch specific early resume code */
+ brasl %r14,s390_early_resume
/* Return 0 */
lmg %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
OpenPOWER on IntegriCloud