summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2010-02-02 14:42:03 +1100
committerSimon Horman <horms@verge.net.au>2010-02-02 14:42:03 +1100
commit02ad89cdc85606dba57c2bca4f77ff432248d6ac (patch)
tree27f70f227ca9028f8c8027cabdcabf946034ab42
parent2178f71f2e77c78b7bc3d46b91b77454e016898f (diff)
cris: cast trampoline_base
# crisv32-axis-linux-gnu-gcc --version crisv32-axis-linux-gnu-gcc (GCC) 3.2.1 Axis release R64/1.64 Copyright (C) 2002 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # make kexec/arch/cris/kexec-elf-cris.c: In function `elf_cris_load': kexec/arch/cris/kexec-elf-cris.c:134: warning: assignment makes pointer from integer without a cast Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--kexec/arch/cris/kexec-elf-cris.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kexec/arch/cris/kexec-elf-cris.c b/kexec/arch/cris/kexec-elf-cris.c
index bb40398..4b56a20 100644
--- a/kexec/arch/cris/kexec-elf-cris.c
+++ b/kexec/arch/cris/kexec-elf-cris.c
@@ -131,6 +131,6 @@ int elf_cris_load(int argc, char **argv, const char *buf, off_t len,
4, 0, elf_max_addr(&ehdr), 1);
memcpy(trampoline_buf,
cris_trampoline, cris_trampoline_size);
- info->entry = trampoline_base;
+ info->entry = (void *)trampoline_base;
return 0;
}