diff options
| author | Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> | 2013-12-06 00:55:30 +0530 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-12-06 18:24:27 +0900 |
| commit | 5676baaf3fb0aa37ad7e4de4fbd512c1f8751068 (patch) | |
| tree | 4d694f639e3e198970802b09d978eee5bef9c63d | |
| parent | b2b9891ce6e883cd83a983ee6e94780f8b0820bc (diff) | |
kexec: Fix add_usable_memory to use buf of type uint64_t.
A switchover from /kexec/arch/ppc64/fs2dt.c to common code under
/kexec/fs2dt.c broke the kdump on ppc64. The function add_usable_memory()
assumes that 'memory@*' node exports two 32bit values and fails
to populate mem ranges correctly. On ppc64, 'memory@*' exports two 64bit
values as below:
# hexdump /proc/device-tree/memory\@0/reg
0000000 0000 0000 0000 0000 0000 0000 0800 0000
0000010
#
This patch fixes add_usable_memory() to use buf[2] of type uint64_t.
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/fs2dt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c index 5d774ae..7202dc1 100644 --- a/kexec/fs2dt.c +++ b/kexec/fs2dt.c @@ -285,8 +285,8 @@ static void add_dyn_reconf_usable_mem_property(struct dirent *dp, int fd) {} static void add_usable_mem_property(int fd, size_t len) { char fname[MAXPATH], *bname; - uint32_t buf[2]; - uint32_t *ranges; + uint64_t buf[2]; + uint64_t *ranges; int ranges_size = MEM_RANGE_CHUNK_SZ; uint64_t base, end, loc_base, loc_end; size_t range; @@ -311,8 +311,8 @@ static void add_usable_mem_property(int fd, size_t len) if (~0ULL - buf[0] < buf[1]) die("unrecoverable error: mem property overflow\n"); - base = be32_to_cpu(buf[0]); - end = base + be32_to_cpu(buf[1]); + base = be64_to_cpu(buf[0]); + end = base + be64_to_cpu(buf[1]); ranges = malloc(ranges_size * sizeof(*ranges)); if (!ranges) |