diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-08-17 18:42:24 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-16 21:27:46 (GMT) |
| commit | 85055dd805f0822f13f736bee2a521e222c38293 (patch) | |
| tree | edbad90395fc7471732edfb5372adcd7e55e791b /arch/s390/kernel/swsusp_asm64.S | |
| parent | ca123102f69fb260221502ade9bbc069290fae84 (diff) | |
| download | linux-fsl-qoriq-85055dd805f0822f13f736bee2a521e222c38293.tar.xz | |
PM / Hibernate: Include storage keys in hibernation image on s390
For s390 there is one additional byte associated with each page,
the storage key. This byte contains the referenced and changed
bits and needs to be included into the hibernation image.
If the storage keys are not restored to their previous state all
original pages would appear to be dirty. This can cause
inconsistencies e.g. with read-only filesystems.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/s390/kernel/swsusp_asm64.S')
| -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 51bcdb5..acb78cd 100644 --- 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 |