rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: bz221272

Browse Source
This commit is contained in:
Neil Horman 2007-01-05 18:35:38 +00:00
parent 9bcc5f1b27
commit 47e2f22d82
3 changed files with 133 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
kexec-tools-1.101-reloc-update.patch
View File

@ -1,5 +1,5 @@
--- kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h.orig 2004-12-20 18:05:40.000000000 -0500 --- kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h.orig 2004-12-20 18:05:40.000000000 -0500
+++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2007-01-05 13:32:24.000000000 -0500
@@ -311,7 +311,7 @@ @@ -311,7 +311,7 @@
TTYS0_TX_AL TTYS0_TX_AL
@ -10,7 +10,7 @@
#define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n')
--- kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S.orig 2004-12-20 05:48:45.000000000 -0500 --- kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S.orig 2004-12-20 05:48:45.000000000 -0500
+++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2007-01-05 13:32:24.000000000 -0500
@@ -127,10 +127,10 @@ @@ -127,10 +127,10 @@
TTYS0_TX_AL TTYS0_TX_AL
@ -182,7 +182,7 @@
setup16_debug_old_code32: setup16_debug_old_code32:
.long 0x10000 .long 0x10000
--- kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S.orig 2004-12-20 18:11:43.000000000 -0500 --- kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S.orig 2004-12-20 18:11:43.000000000 -0500
+++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2007-01-05 13:32:24.000000000 -0500
@@ -55,15 +55,15 @@ entry16_debug: @@ -55,15 +55,15 @@ entry16_debug:
orl %ecx, 0x14 + gdt orl %ecx, 0x14 + gdt
@ -261,7 +261,7 @@
entry16_debug_old_first32: entry16_debug_old_first32:
.long 0x100000 .long 0x100000
--- kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h.orig 2004-12-20 18:03:17.000000000 -0500 --- kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h.orig 2004-12-20 18:03:17.000000000 -0500
+++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2007-01-05 13:32:24.000000000 -0500
@@ -311,6 +311,6 @@ @@ -311,6 +311,6 @@
TTYS0_TX_AL TTYS0_TX_AL
@ -270,8 +270,8 @@
+#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n')
#define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n')
#define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n')
--- kexec-tools-1.101/kexec/Makefile.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/Makefile.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/Makefile 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/Makefile 2007-01-05 13:32:24.000000000 -0500
@@ -13,6 +13,7 @@ KEXEC_C_SRCS:= kexec/kexec.c @@ -13,6 +13,7 @@ KEXEC_C_SRCS:= kexec/kexec.c
KEXEC_C_SRCS+= kexec/ifdown.c KEXEC_C_SRCS+= kexec/ifdown.c
KEXEC_C_SRCS+= kexec/kexec-elf.c KEXEC_C_SRCS+= kexec/kexec-elf.c
@ -280,8 +280,8 @@
KEXEC_C_SRCS+= kexec/kexec-elf-rel.c KEXEC_C_SRCS+= kexec/kexec-elf-rel.c
KEXEC_C_SRCS+= kexec/kexec-elf-boot.c KEXEC_C_SRCS+= kexec/kexec-elf-boot.c
KEXEC_C_SRCS+= kexec/crashdump.c KEXEC_C_SRCS+= kexec/crashdump.c
--- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2007-01-05 13:32:24.000000000 -0500
@@ -135,10 +135,11 @@ static struct mem_rela elf_rela(struct m @@ -135,10 +135,11 @@ static struct mem_rela elf_rela(struct m
return rela; return rela;
} }
@ -311,8 +311,8 @@
if (result < 0) { if (result < 0) {
die("ELF rel parse failed\n"); die("ELF rel parse failed\n");
} }
--- kexec-tools-1.101/kexec/kexec-elf.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/kexec-elf.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec-elf.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf.c 2007-01-05 13:32:24.000000000 -0500
@@ -368,7 +368,8 @@ static int build_mem_elf64_phdr(const ch @@ -368,7 +368,8 @@ static int build_mem_elf64_phdr(const ch
return 0; return 0;
} }
@ -399,8 +399,8 @@
if (result < 0) { if (result < 0) {
free_elf_info(ehdr); free_elf_info(ehdr);
return result; return result;
--- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2007-01-05 13:32:24.000000000 -0500
@@ -56,7 +56,7 @@ int elf_ia64_probe(const char *buf, off_ @@ -56,7 +56,7 @@ int elf_ia64_probe(const char *buf, off_
{ {
struct mem_ehdr ehdr; struct mem_ehdr ehdr;
@ -428,8 +428,8 @@
if (load_crashdump_segments(info, &ehdr, max_addr, 0, if (load_crashdump_segments(info, &ehdr, max_addr, 0,
--- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2007-01-05 13:32:24.000000000 -0500
@@ -24,8 +24,10 @@ @@ -24,8 +24,10 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -702,7 +702,7 @@
return -1; return -1;
cmdline_add_memmap(mod_cmdline, memmap_p); cmdline_add_memmap(mod_cmdline, memmap_p);
--- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c.orig 2004-12-21 12:51:24.000000000 -0500 --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c.orig 2004-12-21 12:51:24.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2007-01-05 13:32:24.000000000 -0500
@@ -60,7 +60,7 @@ static const char *reloc_name(unsigned l @@ -60,7 +60,7 @@ static const char *reloc_name(unsigned l
void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type,
void *location, unsigned long address, unsigned long value) void *location, unsigned long address, unsigned long value)
@ -712,8 +712,8 @@
fprintf(stderr, "%s\n", reloc_name(r_type)); fprintf(stderr, "%s\n", reloc_name(r_type));
#endif #endif
switch(r_type) { switch(r_type) {
--- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2007-01-05 13:32:24.000000000 -0500
@@ -47,7 +47,7 @@ int elf_x86_64_probe(const char *buf, of @@ -47,7 +47,7 @@ int elf_x86_64_probe(const char *buf, of
struct mem_ehdr ehdr; struct mem_ehdr ehdr;
@ -741,8 +741,8 @@
} }
if (arg_style == ARG_STYLE_NONE) { if (arg_style == ARG_STYLE_NONE) {
info->entry = (void *)entry; info->entry = (void *)entry;
--- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2007-01-05 13:32:24.000000000 -0500
@@ -64,7 +64,7 @@ int get_memory_ranges(struct memory_rang @@ -64,7 +64,7 @@ int get_memory_ranges(struct memory_rang
continue; continue;
str = line + consumed; str = line + consumed;
@ -761,8 +761,8 @@
printf("%016Lx-%016Lx : %x\n", printf("%016Lx-%016Lx : %x\n",
start, end, type); start, end, type);
#endif #endif
--- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2007-01-05 13:32:24.000000000 -0500
@@ -47,7 +47,7 @@ int elf_x86_probe(const char *buf, off_t @@ -47,7 +47,7 @@ int elf_x86_probe(const char *buf, off_t
struct mem_ehdr ehdr; struct mem_ehdr ehdr;
@ -790,8 +790,8 @@
} }
if (arg_style == ARG_STYLE_NONE) { if (arg_style == ARG_STYLE_NONE) {
info->entry = (void *)entry; info->entry = (void *)entry;
--- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-01-05 13:32:24.000000000 -0500
@@ -209,10 +209,11 @@ int multiboot_x86_load(int argc, char ** @@ -209,10 +209,11 @@ int multiboot_x86_load(int argc, char **
@ -806,19 +806,8 @@
/* The first segment will contain the multiboot headers: /* The first segment will contain the multiboot headers:
* ============= * =============
--- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 11:15:00.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 12:45:07.000000000 -0500
@@ -175,7 +175,7 @@ int do_bzImage_load(struct kexec_info *i
* it's gdt.
*/
elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
- 0x3000, 640*1024, -1);
+ 0x3000, 640*1024, -1, 0);
/* The argument/parameter segment */
setup_size = kern16_size + command_line_len;
--- kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c.orig 2005-01-20 14:10:56.000000000 -0500 --- kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c.orig 2005-01-20 14:10:56.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2007-01-05 13:32:24.000000000 -0500
@@ -72,7 +72,7 @@ int elf_ppc_probe(const char *buf, off_t @@ -72,7 +72,7 @@ int elf_ppc_probe(const char *buf, off_t
struct mem_ehdr ehdr; struct mem_ehdr ehdr;
@ -837,8 +826,8 @@
if (result < 0) { if (result < 0) {
free_elf_info(&ehdr); free_elf_info(&ehdr);
return result; return result;
--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-01-05 13:32:24.000000000 -0500
@@ -52,7 +52,7 @@ int elf_ppc64_probe(const char *buf, off @@ -52,7 +52,7 @@ int elf_ppc64_probe(const char *buf, off
{ {
struct mem_ehdr ehdr; struct mem_ehdr ehdr;
@ -867,7 +856,7 @@
/* Add a ram-disk to the current image /* Add a ram-disk to the current image
* Note: Add the ramdisk after elf_rel_build_load * Note: Add the ramdisk after elf_rel_build_load
--- /dev/null 2006-12-27 08:05:56.458406418 -0500 --- /dev/null 2006-12-27 08:05:56.458406418 -0500
+++ kexec-tools-1.101/kexec/kexec-elf-core.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf-core.c 2007-01-05 13:32:24.000000000 -0500
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
+#include <stdio.h> +#include <stdio.h>
+#include <stdint.h> +#include <stdint.h>
@ -898,8 +887,8 @@
+ +
+ return 0; + return 0;
+} +}
--- kexec-tools-1.101/kexec/kexec-elf.h.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/kexec-elf.h.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec-elf.h 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf.h 2007-01-05 13:32:24.000000000 -0500
@@ -82,22 +82,29 @@ typedef struct @@ -82,22 +82,29 @@ typedef struct
uint32_t n_type; /* Type of the note. */ uint32_t n_type; /* Type of the note. */
} ElfNN_Nhdr; } ElfNN_Nhdr;
@ -935,8 +924,8 @@
extern int elf_rel_find_symbol(struct mem_ehdr *ehdr, extern int elf_rel_find_symbol(struct mem_ehdr *ehdr,
const char *name, struct mem_sym *ret_sym); const char *name, struct mem_sym *ret_sym);
--- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2007-01-05 13:32:24.000000000 -0500
@@ -11,11 +11,12 @@ @@ -11,11 +11,12 @@
static const int probe_debug = 0; static const int probe_debug = 0;
@ -966,8 +955,8 @@
if (result < 0) { if (result < 0) {
die("ELF exec parse failed\n"); die("ELF exec parse failed\n");
} }
--- kexec-tools-1.101/kexec/crashdump.h.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/crashdump.h.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/crashdump.h 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/crashdump.h 2007-01-05 13:32:24.000000000 -0500
@@ -5,5 +5,7 @@ extern int get_crash_notes_per_cpu(int c @@ -5,5 +5,7 @@ extern int get_crash_notes_per_cpu(int c
/* Need to find a better way to determine per cpu notes section size. */ /* Need to find a better way to determine per cpu notes section size. */
@ -976,8 +965,8 @@
+#define KCORE_ELF_HEADERS_SIZE 4096 +#define KCORE_ELF_HEADERS_SIZE 4096
#endif /* CRASHDUMP_H */ #endif /* CRASHDUMP_H */
--- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 13:32:24.000000000 -0500
@@ -116,6 +116,9 @@ struct kexec_info { @@ -116,6 +116,9 @@ struct kexec_info {
struct mem_ehdr rhdr; struct mem_ehdr rhdr;
unsigned long backup_start; unsigned long backup_start;
@ -996,8 +985,8 @@
extern char *slurp_decompress_file(const char *filename, off_t *r_size); extern char *slurp_decompress_file(const char *filename, off_t *r_size);
extern void add_segment(struct kexec_info *info, extern void add_segment(struct kexec_info *info,
const void *buf, size_t bufsz, unsigned long base, size_t memsz); const void *buf, size_t bufsz, unsigned long base, size_t memsz);
--- kexec-tools-1.101/kexec/kexec.c.orig 2007-01-05 11:15:00.000000000 -0500 --- kexec-tools-1.101/kexec/kexec.c.orig 2007-01-05 13:32:05.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec.c 2007-01-05 12:45:07.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.c 2007-01-05 13:32:24.000000000 -0500
@@ -391,6 +391,50 @@ char *slurp_file(const char *filename, o @@ -391,6 +391,50 @@ char *slurp_file(const char *filename, o
return buf; return buf;
} }

108
kexec-tools-1.101-relocatable-bzimage.patch
View File

@ -1,5 +1,5 @@
--- kexec-tools-1.101/include/x86/x86-linux.h.orig 2004-12-20 05:10:21.000000000 -0500 --- kexec-tools-1.101/include/x86/x86-linux.h.orig 2007-01-05 13:28:08.000000000 -0500
+++ kexec-tools-1.101/include/x86/x86-linux.h 2007-01-05 11:05:30.000000000 -0500 +++ kexec-tools-1.101/include/x86/x86-linux.h 2007-01-05 13:24:49.000000000 -0500
@@ -141,7 +141,10 @@ struct x86_linux_param_header { @@ -141,7 +141,10 @@ struct x86_linux_param_header {
uint32_t high_filesz; /* 0x254 */ uint32_t high_filesz; /* 0x254 */
uint8_t reserved15[0x2d0 - 0x258]; /* 0x258 */ uint8_t reserved15[0x2d0 - 0x258]; /* 0x258 */
@ -29,8 +29,8 @@
+#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF +#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF
#endif /* X86_LINUX_H */ #endif /* X86_LINUX_H */
--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig 2007-01-05 11:05:11.000000000 -0500 --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig 2007-01-05 13:28:08.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-01-05 11:05:30.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-01-05 13:27:53.000000000 -0500
@@ -680,7 +680,9 @@ int load_crashdump_segments(struct kexec @@ -680,7 +680,9 @@ int load_crashdump_segments(struct kexec
tmp = xmalloc(sz); tmp = xmalloc(sz);
memset(tmp, 0, sz); memset(tmp, 0, sz);
@ -52,8 +52,8 @@
if (delete_memmap(memmap_p, elfcorehdr, sz) < 0) if (delete_memmap(memmap_p, elfcorehdr, sz) < 0)
return -1; return -1;
cmdline_add_memmap(mod_cmdline, memmap_p); cmdline_add_memmap(mod_cmdline, memmap_p);
--- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c.orig 2007-01-05 11:05:11.000000000 -0500 --- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c.orig 2007-01-05 13:28:08.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2007-01-05 11:05:30.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2007-01-05 13:24:49.000000000 -0500
@@ -59,6 +59,7 @@ void setup_linux_bootloader_parameters( @@ -59,6 +59,7 @@ void setup_linux_bootloader_parameters(
initrd_addr_max = DEFAULT_INITRD_ADDR_MAX; initrd_addr_max = DEFAULT_INITRD_ADDR_MAX;
if (real_mode->protocol_version >= 0x0203) { if (real_mode->protocol_version >= 0x0203) {
@ -71,8 +71,8 @@
} else { } else {
initrd_base = 0; initrd_base = 0;
initrd_size = 0; initrd_size = 0;
--- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 11:05:11.000000000 -0500 --- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 13:28:08.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 11:07:04.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 13:27:53.000000000 -0500
@@ -34,8 +34,10 @@ @@ -34,8 +34,10 @@
#include <x86/x86-linux.h> #include <x86/x86-linux.h>
#include "../../kexec.h" #include "../../kexec.h"
@ -84,18 +84,33 @@
#include <arch/options.h> #include <arch/options.h>
static const int probe_debug = 0; static const int probe_debug = 0;
@@ -109,6 +111,7 @@ int do_bzImage_load(struct kexec_info *i @@ -109,6 +111,9 @@ int do_bzImage_load(struct kexec_info *i
unsigned long setup_base, setup_size; unsigned long setup_base, setup_size;
struct entry32_regs regs32; struct entry32_regs regs32;
struct entry16_regs regs16; struct entry16_regs regs16;
+ unsigned int relocatable_kernel = 0;
+ unsigned long kernel32_load_addr;
+ char *modified_cmdline; + char *modified_cmdline;
/* /*
* Find out about the file I am about to load. * Find out about the file I am about to load.
@@ -128,6 +131,45 @@ int do_bzImage_load(struct kexec_info *i @@ -121,6 +126,7 @@ int do_bzImage_load(struct kexec_info *i
if (setup_sects == 0) {
setup_sects = 4;
}
+
kern16_size = (setup_sects +1) *512;
kernel_version = ((unsigned char *)&setup_header) + 512 + setup_header.kver_addr;
if (kernel_len < kern16_size) {
@@ -128,25 +134,88 @@ int do_bzImage_load(struct kexec_info *i
return -1; return -1;
} }
+ if (setup_header.protocol_version >= 0x0205) {
+ relocatable_kernel = setup_header.relocatable_kernel;
+ dfprintf(stdout, "bzImage is relocatable\n");
+ }
+
+ /* Can't use bzImage for crash dump purposes with real mode entry */ + /* Can't use bzImage for crash dump purposes with real mode entry */
+ if((info->kexec_flags & KEXEC_ON_CRASH) && real_mode_entry) { + if((info->kexec_flags & KEXEC_ON_CRASH) && real_mode_entry) {
+ fprintf(stderr, "Can't use bzImage for crash dump purposes" + fprintf(stderr, "Can't use bzImage for crash dump purposes"
@ -138,7 +153,20 @@
/* Load the trampoline. This must load at a higher address /* Load the trampoline. This must load at a higher address
* the the argument/parameter segment or the kernel will stomp * the the argument/parameter segment or the kernel will stomp
* it's gdt. * it's gdt.
@@ -139,7 +181,16 @@ int do_bzImage_load(struct kexec_info *i */
- elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
- 0x3000, 640*1024, -1);
+
+ if (!real_mode_entry && relocatable_kernel)
+ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
+ 0x3000, -1, -1, 0);
+ else
+ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
+ 0x3000, 640*1024, -1, 0);
+ dfprintf(stdout, "Loaded purgatory at addr 0x%lx\n",
+ info->rhdr.rel_addr);
/* The argument/parameter segment */
setup_size = kern16_size + command_line_len; setup_size = kern16_size + command_line_len;
real_mode = xmalloc(setup_size); real_mode = xmalloc(setup_size);
memcpy(real_mode, kernel, kern16_size); memcpy(real_mode, kernel, kern16_size);
@ -155,9 +183,61 @@
+ else if (real_mode->protocol_version >= 0x0200) { + else if (real_mode->protocol_version >= 0x0200) {
/* Careful setup_base must be greater than 8K */ /* Careful setup_base must be greater than 8K */
setup_base = add_buffer(info, real_mode, setup_size, setup_size, setup_base = add_buffer(info, real_mode, setup_size, setup_size,
16, 0x3000, 640*1024, -1); - 16, 0x3000, 640*1024, -1);
--- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 11:05:11.000000000 -0500 + 16, 0x3000, 640*1024, 1);
+++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 11:05:30.000000000 -0500 } else {
add_segment(info, real_mode, setup_size, SETUP_BASE, setup_size);
setup_base = SETUP_BASE;
}
+ dfprintf(stdout, "Loaded real-mode code and command line at 0x%lx\n",
+ setup_base);
+
/* Verify purgatory loads higher than the parameters */
if (info->rhdr.rel_addr < setup_base) {
die("Could not put setup code above the kernel parameters\n");
@@ -154,9 +223,30 @@ int do_bzImage_load(struct kexec_info *i
/* The main kernel segment */
size = kernel_len - kern16_size;
- add_segment(info, kernel + kern16_size, size, KERN32_BASE, size);
+ if (real_mode->protocol_version >=0x0205 && relocatable_kernel) {
+ /* Relocatable bzImage */
+ unsigned long kern_align = real_mode->kernel_alignment;
+ unsigned long kernel32_max_addr = DEFAULT_BZIMAGE_ADDR_MAX;
+
+ if (real_mode->protocol_version >= 0x0203) {
+ if (kernel32_max_addr > real_mode->initrd_addr_max)
+ kernel32_max_addr = real_mode->initrd_addr_max;
+ }
+
+ kernel32_load_addr = add_buffer(info, kernel + kern16_size,
+ size, size, kern_align,
+ 0x100000, kernel32_max_addr,
+ 1);
+ }
+ else {
+ kernel32_load_addr = KERN32_BASE;
+ add_segment(info, kernel + kern16_size, size,
+ kernel32_load_addr, size);
+ }
+ dfprintf(stdout, "Loaded 32bit kernel at 0x%lx\n", kernel32_load_addr);
+
/* Tell the kernel what is going on */
setup_linux_bootloader_parameters(info, real_mode, setup_base,
kern16_size, command_line, command_line_len,
@@ -177,7 +267,7 @@ int do_bzImage_load(struct kexec_info *i
regs32.edi = 0; /* unused */
regs32.esp = elf_rel_get_addr(&info->rhdr, "stack_end"); /* stack, unused */
regs32.ebp = 0; /* unused */
- regs32.eip = KERN32_BASE; /* kernel entry point */
+ regs32.eip = kernel32_load_addr; /* kernel entry point */
/*
* Initialize the 16bit start information.
--- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 13:28:08.000000000 -0500
+++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 13:24:43.000000000 -0500
@@ -197,4 +197,11 @@ int arch_compat_trampoline(struct kexec_ @@ -197,4 +197,11 @@ int arch_compat_trampoline(struct kexec_
void arch_update_purgatory(struct kexec_info *info); void arch_update_purgatory(struct kexec_info *info);

2
kexec-tools.spec
View File

@ -31,6 +31,7 @@ Obsoletes: diskdumputils netdump
Patch1: kexec-tools-1.101-kdump.patch Patch1: kexec-tools-1.101-kdump.patch
Patch2: kexec-tools-1.101-elf-core-type.patch Patch2: kexec-tools-1.101-elf-core-type.patch
Patch3: kexec-tools-1.101-bzimage-options.patch Patch3: kexec-tools-1.101-bzimage-options.patch
Patch4: kexec-tools-1.101-relocatable-bzimage.patch
# #
# Patches 101 through 200 are meant for x86_64 kexec-tools enablement # Patches 101 through 200 are meant for x86_64 kexec-tools enablement
@ -94,6 +95,7 @@ rm -f ../kexec-tools-1.101.spec
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch201 -p1 %patch201 -p1