Skip to contentSkip to conversation

kexec: iomem: fix callbacks params for sh and x86 archs

PATCH Applied Roman Pen 2 participants 2 messages Feb 24, 2015 – Feb 25, 2015

Subsystems (2)
lore
Share & tools
lore

Roman Pen

author
#0 lore raw

PATCH 1/1 kexec: iomem: fix callbacks params for sh and x86 archs

Commit 4362bfac changes params for kexec_iomem_for_each_line from 'unsigned long' to 'unsigned long long'.

This patch fixes forgotten changes for sh and x86 archs. Bug causes incorrect parsing of memory ranges.

---
 kexec/arch/i386/crashdump-x86.c | 4 ++--
 kexec/arch/sh/crashdump-sh.c    | 4 ++--
 kexec/arch/sh/kexec-sh.c        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
kexec/arch/i386/crashdump-x86.c +2 -2
index 77bdad5..82bf239 100644
@@ -1041,8 +1041,8 @@ int get_max_crash_kernel_limit(uint64_t *start, uint64_t *end)
 
 static int crashkernel_mem_callback(void *UNUSED(data), int nr,
                                           char *UNUSED(str),
-                                          unsigned long base,
-                                          unsigned long length)
+                                          unsigned long long base,
+                                          unsigned long long length)
 {
 	if (nr >= CRASH_RESERVED_MEM_NR)
 		return 1;
kexec/arch/sh/crashdump-sh.c +2 -2
index fe11b17..9e6af6b 100644
@@ -34,8 +34,8 @@ static struct memory_range crash_memory_range[CRASH_MAX_MEMORY_RANGES];
 static int crash_sh_range_nr;
 static int crash_sh_memory_range_callback(void *UNUSED(data), int UNUSED(nr),
 					  char *str,
-					  unsigned long base,
-					  unsigned long length)
+					  unsigned long long base,
+					  unsigned long long length)
 {
 
 	struct memory_range *range = crash_memory_range;
kexec/arch/sh/kexec-sh.c +2 -2
index aea5dfb..ce341c8 100644
@@ -24,8 +24,8 @@ static struct memory_range memory_range[MAX_MEMORY_RANGES];
 
 static int kexec_sh_memory_range_callback(void *UNUSED(data), int nr,
 					  char *UNUSED(str),
-					  unsigned long base,
-					  unsigned long length)
+					  unsigned long long base,
+					  unsigned long long length)
 {
 	if (nr < MAX_MEMORY_RANGES) {
 		memory_range[nr].start = base;
Signature · 7 lines
2.2.2


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Applied
#1 lore raw
Quoted 8 lines · Roman Pen

Commit 4362bfac changes params for kexec_iomem_for_each_line from 'unsigned long' to 'unsigned long long'.

This patch fixes forgotten changes for sh and x86 archs. Bug causes incorrect parsing of memory ranges.

Thanks, applied.

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec