diff options
author | Colin Cross <ccross@android.com> | 2014-02-06 07:33:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-06 07:33:45 +0000 |
commit | fb2fc9e55a52c50adfb5b62ba1b70e8dac646ab4 (patch) | |
tree | aca1b8ac60959f81b074f874511cad4f7fecbec4 | |
parent | 991d0bbb02662ef36b3d770e914bd61cbe9d392a (diff) | |
parent | 1070ada9d23531e494167fe81a81f9f1b82aaa21 (diff) | |
download | extras-fb2fc9e55a52c50adfb5b62ba1b70e8dac646ab4.tar.gz |
Merge "kexecload: fix LP64 warnings"
-rw-r--r-- | kexec_tools/kexecload.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kexec_tools/kexecload.c b/kexec_tools/kexecload.c index 2574e4a6..0beef897 100644 --- a/kexec_tools/kexecload.c +++ b/kexec_tools/kexecload.c @@ -141,15 +141,15 @@ int main(int argc, char *argv[]) segment[0].buf = zimage_buffer; segment[0].bufsz = zimage_size; - segment[0].mem = (void *) ((unsigned) start_address + KEXEC_ARM_ZIMAGE_OFFSET); + segment[0].mem = (void *) ((uintptr_t) start_address + KEXEC_ARM_ZIMAGE_OFFSET); segment[0].memsz = zimage_size; segment[1].buf = atag_buffer; segment[1].bufsz = atag_size; - segment[1].mem = (void *) ((unsigned) start_address + KEXEC_ARM_ATAGS_OFFSET); + segment[1].mem = (void *) ((uintptr_t) start_address + KEXEC_ARM_ATAGS_OFFSET); segment[1].memsz = atag_size; - rv = kexec_load(((unsigned) start_address + KEXEC_ARM_ZIMAGE_OFFSET), + rv = kexec_load(((uintptr_t) start_address + KEXEC_ARM_ZIMAGE_OFFSET), 2, (void *) segment, KEXEC_ARCH_DEFAULT | KEXEC_ON_CRASH); if (rv != 0) { |