diff --git a/kexec-tools-1.101-ia64-fixup.patch b/kexec-tools-1.101-ia64-fixup.patch new file mode 100644 index 0000000..b1cd1b0 --- /dev/null +++ b/kexec-tools-1.101-ia64-fixup.patch @@ -0,0 +1,40 @@ +--- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig 2006-07-05 13:02:12.000000000 -0400 ++++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c 2006-07-05 13:17:41.000000000 -0400 +@@ -87,8 +87,6 @@ int arch_process_options(int argc, char + }; + static const char short_options[] = KEXEC_ARCH_OPT_STR; + int opt; +- unsigned long value; +- char *end; + + opterr = 0; /* Don't complain about unrecognized options here */ + while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) { +@@ -115,28 +113,6 @@ int arch_compat_trampoline(struct kexec_ + } + if (strcmp(utsname.machine, "ia64") == 0) + { +- info->kexec_flags |= KEXEC_ARCH_X86_64; +- } +- else { +- fprintf(stderr, "Unsupported machine type: %s\n", +- utsname.machine); +- return -1; +- } +- return 0; +-} +- +-int arch_compat_trampoline(struct kexec_info *info) +-{ +- int result; +- struct utsname utsname; +- result = uname(&utsname); +- if (result < 0) { +- fprintf(stderr, "uname failed: %s\n", +- strerror(errno)); +- return -1; +- } +- if (strcmp(utsname.machine, "ia64") == 0) +- { + /* For compatibility with older patches + * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here. + */ diff --git a/kexec-tools.spec b/kexec-tools.spec index 4090a7e..a1efc05 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -24,6 +24,7 @@ Patch101: kexec-tools-1.101-disable-kdump-x8664.patch # # Patches 201 through 300 are meant for ia64 kexec-tools enablement # +Patch201: kexec-tools-1.101-ia64-fixup.patch # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement @@ -44,6 +45,7 @@ component of the kernel's kexec feature. rm -f ../kexec-tools-1.101.spec %patch1 -p1 %patch101 -p1 +%patch201 -p1 %patch301 -p1 %patch501 -p1