diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-06 02:12:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-06 02:12:05 +0000 |
| commit | 68835ee88b146f654fe3ce007f07ace71266e876 (patch) | |
| tree | 92b5a9331b64f97c3201fa0798f57daa10d6fd17 /fastbootd/commands.c | |
| parent | eaba2bedf529eeb21351c8bf6365107cb6a4e8b6 (diff) | |
| parent | 5d9fe779c8ec2705865a23061834ad8cdbee5b82 (diff) | |
| download | system_core-68835ee88b146f654fe3ce007f07ace71266e876.zip system_core-68835ee88b146f654fe3ce007f07ace71266e876.tar.gz system_core-68835ee88b146f654fe3ce007f07ace71266e876.tar.bz2 | |
Merge "system/core LP64 cleanup."
Diffstat (limited to 'fastbootd/commands.c')
| -rw-r--r-- | fastbootd/commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fastbootd/commands.c b/fastbootd/commands.c index 063e1a6..98b7866 100644 --- a/fastbootd/commands.c +++ b/fastbootd/commands.c @@ -124,9 +124,9 @@ static void cmd_boot(struct protocol_handle *phandle, const char *arg) goto error; } - kernel_ptr = (void *)((unsigned) ptr + hdr->page_size); - ramdisk_ptr = (void *)((unsigned) kernel_ptr + kernel_actual); - second_ptr = (void *)((unsigned) ramdisk_ptr + ramdisk_actual); + kernel_ptr = (void *)((uintptr_t) ptr + hdr->page_size); + ramdisk_ptr = (void *)((uintptr_t) kernel_ptr + kernel_actual); + second_ptr = (void *)((uintptr_t) ramdisk_ptr + ramdisk_actual); D(INFO, "preparing to boot"); // Prepares boot physical address. Addresses from header are ignored |