summaryrefslogtreecommitdiff
path: root/kexec/arch
diff options
context:
space:
mode:
Diffstat (limited to 'kexec/arch')
-rw-r--r--kexec/arch/i386/crashdump-x86.c5
-rw-r--r--kexec/arch/i386/kexec-bzImage.c9
-rw-r--r--kexec/arch/i386/x86-linux-setup.c6
3 files changed, 9 insertions, 11 deletions
diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c
index a4087b0..c5827ae 100644
--- a/kexec/arch/i386/crashdump-x86.c
+++ b/kexec/arch/i386/crashdump-x86.c
@@ -515,8 +515,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
memset(tmp, 0, sz);
info->backup_start = add_buffer(info, tmp, sz, sz, align,
0, max_addr, -1);
- dfprintf(stdout, "Created backup segment at 0x%lx\n",
- info->backup_start);
+ dprintf("Created backup segment at 0x%lx\n", info->backup_start);
if (delete_memmap(memmap_p, info->backup_start, sz) < 0)
return -1;
@@ -545,7 +544,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
*/
elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base,
max_addr, -1);
- dfprintf(stdout, "Created elf header segment at 0x%lx\n", elfcorehdr);
+ dprintf("Created elf header segment at 0x%lx\n", elfcorehdr);
if (delete_memmap(memmap_p, elfcorehdr, sz) < 0)
return -1;
cmdline_add_memmap(mod_cmdline, memmap_p);
diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c
index 19fef11..8acd0bd 100644
--- a/kexec/arch/i386/kexec-bzImage.c
+++ b/kexec/arch/i386/kexec-bzImage.c
@@ -136,7 +136,7 @@ int do_bzImage_load(struct kexec_info *info,
if (setup_header.protocol_version >= 0x0205) {
relocatable_kernel = setup_header.relocatable_kernel;
- dfprintf(stdout, "bzImage is relocatable\n");
+ dprintf("bzImage is relocatable\n");
}
/* Can't use bzImage for crash dump purposes with real mode entry */
@@ -192,8 +192,7 @@ int do_bzImage_load(struct kexec_info *info,
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);
+ dprintf("Loaded purgatory at addr 0x%lx\n", info->rhdr.rel_addr);
/* The argument/parameter segment */
setup_size = kern16_size + command_line_len;
real_mode = xmalloc(setup_size);
@@ -215,7 +214,7 @@ int do_bzImage_load(struct kexec_info *info,
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",
+ dprintf("Loaded real-mode code and command line at 0x%lx\n",
setup_base);
/* Verify purgatory loads higher than the parameters */
@@ -247,7 +246,7 @@ int do_bzImage_load(struct kexec_info *info,
kernel32_load_addr, size);
}
- dfprintf(stdout, "Loaded 32bit kernel at 0x%lx\n", kernel32_load_addr);
+ dprintf("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,
diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
index e1cff1d..f502151 100644
--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -61,7 +61,7 @@ void setup_linux_bootloader_parameters(
initrd_addr_max = DEFAULT_INITRD_ADDR_MAX;
if (real_mode->protocol_version >= 0x0203) {
initrd_addr_max = real_mode->initrd_addr_max;
- dfprintf(stdout, "initrd_addr_max is 0x%lx\n", initrd_addr_max);
+ dprintf("initrd_addr_max is 0x%lx\n", initrd_addr_max);
}
/* Load the initrd if we have one */
@@ -69,8 +69,8 @@ void setup_linux_bootloader_parameters(
initrd_base = add_buffer(info,
initrd_buf, initrd_size, initrd_size,
4096, INITRD_BASE, initrd_addr_max, -1);
- dfprintf(stdout, "Loaded initrd at 0x%lx size 0x%lx\n",
- initrd_base, initrd_size);
+ dprintf("Loaded initrd at 0x%lx size 0x%lx\n", initrd_base,
+ initrd_size);
} else {
initrd_base = 0;
initrd_size = 0;