git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
swsusp_asm64.S
diff --git
a/arch/s390/kernel/swsusp_asm64.S
b/arch/s390/kernel/swsusp_asm64.S
index
b354427
..
c56d3f5
100644
(file)
--- a/
arch/s390/kernel/swsusp_asm64.S
+++ b/
arch/s390/kernel/swsusp_asm64.S
@@
-256,6
+256,9
@@
restore_registers:
lghi %r2,0
brasl %r14,arch_set_page_states
+ /* Reinitialize the channel subsystem */
+ brasl %r14,channel_subsystem_reinit
+
/* Return 0 */
lmg %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
lghi %r2,0