From a2d9b444eb54029513ad2300466b3cf55dbcd9b5 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Thu, 11 Mar 2010 00:21:33 -0800 Subject: kexec: Figure out our native architecture before load This moves the computing of our native archtecture earlier so that load can use it, as arch/i386/crashdump-x86.c has been trying to. Signed-off-by: Eric W. Biederman Signed-off-by: Simon Horman --- kexec/kexec.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kexec/kexec.c b/kexec/kexec.c index 43d0189..16a0ec9 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -695,17 +695,19 @@ static int my_load(const char *type, int fileind, int argc, char **argv, } } } + /* Figure out our native architecture before load */ + native_arch = physical_arch(); + if (native_arch < 0) { + return -1; + } + info.kexec_flags |= native_arch; + if (file_type[i].load(argc, argv, kernel_buf, kernel_size, &info) < 0) { fprintf(stderr, "Cannot load %s\n", kernel); return -1; } /* If we are not in native mode setup an appropriate trampoline */ - native_arch = physical_arch(); - if (native_arch < 0) { - return -1; - } - info.kexec_flags |= native_arch; if (arch_compat_trampoline(&info) < 0) { return -1; } -- cgit