42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
From: Petr Tesarik <ptesarik@suse.com>
|
||
|
|
Date: Mon, 29 Jan 2018 14:59:28 +0200
|
||
|
|
Subject: Always use bigger SECTION_MAP_MASK
|
||
|
|
References: bsc#1066811, bsc#1067703
|
||
|
|
Upstream: not yet
|
||
|
|
|
||
|
|
Since kernel commit 2d070eab2e82 merely reused a previously unused bit, it
|
||
|
|
is safe to mask it off for all kernel versions, because it had always been
|
||
|
|
zero (even in kernels < 4.13).
|
||
|
|
|
||
|
|
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
makedumpfile.c | 5 +----
|
||
|
|
makedumpfile.h | 1 -
|
||
|
|
2 files changed, 1 insertion(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/makedumpfile.c
|
||
|
|
+++ b/makedumpfile.c
|
||
|
|
@@ -3337,10 +3337,7 @@ section_mem_map_addr(unsigned long addr)
|
||
|
|
return NOT_KV_ADDR;
|
||
|
|
}
|
||
|
|
map = ULONG(mem_section + OFFSET(mem_section.section_mem_map));
|
||
|
|
- if (info->kernel_version < KERNEL_VERSION(4, 13, 0))
|
||
|
|
- map &= SECTION_MAP_MASK_4_12;
|
||
|
|
- else
|
||
|
|
- map &= SECTION_MAP_MASK;
|
||
|
|
+ map &= SECTION_MAP_MASK;
|
||
|
|
free(mem_section);
|
||
|
|
|
||
|
|
return map;
|
||
|
|
--- a/makedumpfile.h
|
||
|
|
+++ b/makedumpfile.h
|
||
|
|
@@ -186,7 +186,6 @@ isAnon(unsigned long mapping)
|
||
|
|
#define SECTION_NR_TO_ROOT(sec) ((sec) / SECTIONS_PER_ROOT())
|
||
|
|
#define SECTION_IS_ONLINE (1UL<<2)
|
||
|
|
#define SECTION_MAP_LAST_BIT (1UL<<3)
|
||
|
|
-#define SECTION_MAP_MASK_4_12 (~(SECTION_IS_ONLINE-1))
|
||
|
|
#define SECTION_MAP_MASK (~(SECTION_MAP_LAST_BIT-1))
|
||
|
|
#define NR_SECTION_ROOTS() divideup(num_section, SECTIONS_PER_ROOT())
|
||
|
|
#define SECTION_NR_TO_PFN(sec) ((sec) << PFN_SECTION_SHIFT())
|