diff options
| author | Roman Pen <r.peniaev@gmail.com> | 2015-02-24 21:18:47 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-02-25 13:41:32 +0900 |
| commit | 236e30b2b4dcb3e78c5f5219b66d90c7e9c464fd (patch) | |
| tree | 4ad240598e377d4801776d8925f5daa1b23e3819 | |
| parent | 8e0722a93de0bf71d2fa98d35f5170bf2aafc8a3 (diff) | |
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.
Signed-off-by: Roman Pen <r.peniaev@gmail.com>
Cc: kexec@lists.infradead.org
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/crashdump-x86.c | 4 | ||||
| -rw-r--r-- | kexec/arch/sh/crashdump-sh.c | 4 | ||||
| -rw-r--r-- | kexec/arch/sh/kexec-sh.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index 77bdad5..82bf239 100644 --- a/kexec/arch/i386/crashdump-x86.c +++ b/kexec/arch/i386/crashdump-x86.c @@ -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; diff --git a/kexec/arch/sh/crashdump-sh.c b/kexec/arch/sh/crashdump-sh.c index fe11b17..9e6af6b 100644 --- a/kexec/arch/sh/crashdump-sh.c +++ b/kexec/arch/sh/crashdump-sh.c @@ -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; diff --git a/kexec/arch/sh/kexec-sh.c b/kexec/arch/sh/kexec-sh.c index aea5dfb..ce341c8 100644 --- a/kexec/arch/sh/kexec-sh.c +++ b/kexec/arch/sh/kexec-sh.c @@ -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; |