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 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
51bcdb5
..
acb78cd
100644
(file)
--- a/
arch/s390/kernel/swsusp_asm64.S
+++ b/
arch/s390/kernel/swsusp_asm64.S
@@
-136,11
+136,14
@@
ENTRY(swsusp_arch_resume)
0:
lg %r2,8(%r1)
lg %r4,0(%r1)
+ iske %r0,%r4
lghi %r3,PAGE_SIZE
lghi %r5,PAGE_SIZE
1:
mvcle %r2,%r4,0
jo 1b
+ lg %r2,8(%r1)
+ sske %r0,%r2
lg %r1,16(%r1)
ltgr %r1,%r1
jnz 0b