diff options
| author | Liu Hua <sdu.liu@huawei.com> | 2014-06-05 19:20:07 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2014-06-06 16:01:33 +0900 |
| commit | 4362bfaca4d8d2a4380532880f0d08c2bf14184e (patch) | |
| tree | e86f262f0248dce1546998ce516d3dfe5a886de0 | |
| parent | 272ceb535415437041f989278635ac8de729cd6b (diff) | |
| download | kexec-tools-4362bfaca4d8d2a4380532880f0d08c2bf14184e.tar.gz | |
kexec: iomem: accept u64 parameters for callbacks
Since "start" and "end" in kexec_iomem_for_each_line
are unsigned long long, this patch makes "callback"s
accept unsigned-long-long-type parameters.
Signed-off-by: Wei Jitao <weijitao@huawei.com>
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/arm/crashdump-arm.c | 4 | ||||
| -rw-r--r-- | kexec/kexec-iomem.c | 8 | ||||
| -rw-r--r-- | kexec/kexec.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index d124974..726c1e9 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -134,8 +134,8 @@ static int get_kernel_page_offset(struct kexec_info *info, * regions is placed in @crash_memory_nr_ranges. */ static int crash_range_callback(void *UNUSED(data), int UNUSED(nr), - char *str, unsigned long base, - unsigned long length) + char *str, unsigned long long base, + unsigned long long length) { struct memory_range *range; diff --git a/kexec/kexec-iomem.c b/kexec/kexec-iomem.c index 0396713..485a2e8 100644 --- a/kexec/kexec-iomem.c +++ b/kexec/kexec-iomem.c @@ -26,8 +26,8 @@ int kexec_iomem_for_each_line(char *match, int (*callback)(void *data, int nr, char *str, - unsigned long base, - unsigned long length), + unsigned long long base, + unsigned long long length), void *data) { const char *iomem = proc_iomem(); @@ -65,8 +65,8 @@ int kexec_iomem_for_each_line(char *match, static int kexec_iomem_single_callback(void *data, int nr, char *UNUSED(str), - unsigned long base, - unsigned long length) + unsigned long long base, + unsigned long long length) { struct memory_range *range = data; diff --git a/kexec/kexec.h b/kexec/kexec.h index 22d4a42..2fad7dc 100644 --- a/kexec/kexec.h +++ b/kexec/kexec.h @@ -282,8 +282,8 @@ int kexec_iomem_for_each_line(char *match, int (*callback)(void *data, int nr, char *str, - unsigned long base, - unsigned long length), + unsigned long long base, + unsigned long long length), void *data); int parse_iomem_single(char *str, uint64_t *start, uint64_t *end); const char * proc_iomem(void); |