diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2010-04-22 11:17:04 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-04-22 11:17:19 -0400 |
| commit | 889ee9556c89a877b8343b6bbe6ac8dc5d57e433 (patch) | |
| tree | 562a672608aaa198e83c37331132af184fe0bbb1 /arch/s390/kernel | |
| parent | 818c272bd74b834c3ca9347c6a540c2ec880afdc (diff) | |
[S390] add hook to reenable mss after hibernation
Reenable multiple subchannel sets after hibernation,
prior to the device callbacks.
Cc: <stable@kernel.org>
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')
| -rw-r--r-- | arch/s390/kernel/swsusp_asm64.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S index b354427e03b7..c56d3f56d020 100644 --- a/arch/s390/kernel/swsusp_asm64.S +++ b/arch/s390/kernel/swsusp_asm64.S | |||
| @@ -256,6 +256,9 @@ restore_registers: | |||
| 256 | lghi %r2,0 | 256 | lghi %r2,0 |
| 257 | brasl %r14,arch_set_page_states | 257 | brasl %r14,arch_set_page_states |
| 258 | 258 | ||
| 259 | /* Reinitialize the channel subsystem */ | ||
| 260 | brasl %r14,channel_subsystem_reinit | ||
| 261 | |||
| 259 | /* Return 0 */ | 262 | /* Return 0 */ |
| 260 | lmg %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15) | 263 | lmg %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15) |
| 261 | lghi %r2,0 | 264 | lghi %r2,0 |