diff options
| author | Ingo Molnar | 2017-11-14 07:21:44 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-11-14 07:21:44 +0100 |
| commit | 050ab10a645097e47c01cfab3ccf24167e9b266b (patch) | |
| tree | 686b17c63933f187305a87fba696415dccd032ae /arch/s390/kernel/suspend.c | |
| parent | objtool: Fix cross-build (diff) | |
| parent | x86 / CPU: Avoid unnecessary IPIs in arch_freq_get_on_cpu() (diff) | |
| download | kernel-qcow2-linux-050ab10a645097e47c01cfab3ccf24167e9b266b.tar.gz kernel-qcow2-linux-050ab10a645097e47c01cfab3ccf24167e9b266b.tar.xz kernel-qcow2-linux-050ab10a645097e47c01cfab3ccf24167e9b266b.zip | |
Merge branch 'linus' into core/objtool, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/suspend.c')
| -rw-r--r-- | arch/s390/kernel/suspend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/suspend.c b/arch/s390/kernel/suspend.c index a8af9c825628..ce329c876d8c 100644 --- a/arch/s390/kernel/suspend.c +++ b/arch/s390/kernel/suspend.c @@ -153,7 +153,7 @@ int pfn_is_nosave(unsigned long pfn) { unsigned long nosave_begin_pfn = PFN_DOWN(__pa(&__nosave_begin)); unsigned long nosave_end_pfn = PFN_DOWN(__pa(&__nosave_end)); - unsigned long eshared_pfn = PFN_DOWN(__pa(&_eshared)) - 1; + unsigned long end_rodata_pfn = PFN_DOWN(__pa(&__end_rodata)) - 1; unsigned long stext_pfn = PFN_DOWN(__pa(&_stext)); /* Always save lowcore pages (LC protection might be enabled). */ @@ -161,9 +161,9 @@ int pfn_is_nosave(unsigned long pfn) return 0; if (pfn >= nosave_begin_pfn && pfn < nosave_end_pfn) return 1; - /* Skip memory holes and read-only pages (NSS, DCSS, ...). */ - if (pfn >= stext_pfn && pfn <= eshared_pfn) - return ipl_info.type == IPL_TYPE_NSS ? 1 : 0; + /* Skip memory holes and read-only pages (DCSS, ...). */ + if (pfn >= stext_pfn && pfn <= end_rodata_pfn) + return 0; if (tprot(PFN_PHYS(pfn))) return 1; return 0; |