diff options
| author | Milton Miller <miltonm@bga.com> | 2009-01-02 15:04:51 -0600 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2009-01-16 09:41:05 +1100 |
| commit | 969203ab173765b775e617391a2605c073f63410 (patch) | |
| tree | 772b55c56871da9c9d3697f574d7b555ae7cf004 /kexec/kexec.c | |
| parent | 4fcb65c9089c2c9d203402d549c4e11e44021542 (diff) | |
entry wants to be void *
The kexec info struct defines entry to be a void *, so pass around the
user supplied value as one.
This fixes the following warning:
gcc -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -I./include -I./util_lib/include -Iinclude/ -I./kexec/arch/ppc64/include -c -MD -o kexec/kexec.o kexec/kexec.c
kexec/kexec.c: In function ‘my_load’:
kexec/kexec.c:773: warning: assignment makes pointer from integer without a cast
Signed-off-by: Milton Miller <miltonm@bga.com>
Tested-by: M. Mohan Kumar <mohan@in.ibm.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/kexec.c')
| -rw-r--r-- | kexec/kexec.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/kexec/kexec.c b/kexec/kexec.c index fc01458..c9e9125 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -666,7 +666,7 @@ static void update_purgatory(struct kexec_info *info) * Load the new kernel */ static int my_load(const char *type, int fileind, int argc, char **argv, - unsigned long kexec_flags, unsigned long entry) + unsigned long kexec_flags, void *entry) { char *kernel; char *kernel_buf; @@ -846,23 +846,20 @@ static int my_exec(void) static int kexec_loaded(void); -static int load_jump_back_helper_image(unsigned long kexec_flags, - unsigned long entry) +static int load_jump_back_helper_image(unsigned long kexec_flags, void *entry) { int result; struct kexec_segment seg; memset(&seg, 0, sizeof(seg)); - result = kexec_load((void *)entry, 1, &seg, - kexec_flags); + result = kexec_load(entry, 1, &seg, kexec_flags); return result; } /* * Jump back to the original kernel */ -static int my_load_jump_back_helper(unsigned long kexec_flags, - unsigned long entry) +static int my_load_jump_back_helper(unsigned long kexec_flags, void *entry) { int result; @@ -1036,7 +1033,7 @@ int main(int argc, char *argv[]) int do_ifdown = 0; int do_unload = 0; int do_reuse_initrd = 0; - unsigned long entry = 0; + void *entry = 0; char *type = 0; char *endptr; int opt; @@ -1096,7 +1093,7 @@ int main(int argc, char *argv[]) kexec_flags = KEXEC_PRESERVE_CONTEXT; break; case OPT_ENTRY: - entry = strtoul(optarg, &endptr, 0); + entry = (void *)strtoul(optarg, &endptr, 0); if (*endptr) { fprintf(stderr, "Bad option value in --load-jump-back-helper=%s\n", |