summaryrefslogtreecommitdiff
path: root/kexec/crashdump-elf.c
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2007-05-08 11:58:57 +0900
committerSimon Horman <horms@verge.net.au>2007-05-09 15:42:44 +0900
commitee2bd75816cb20c266ad27e417589e8e6ee7a39e (patch)
tree34362e6675fc2228150f6ca6c492e3221d72405c /kexec/crashdump-elf.c
parent17be877eabcad87dd93980da6375fdaba271204f (diff)
use dprintf
Use the new fprintf macro where possible Cc: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/crashdump-elf.c')
-rw-r--r--kexec/crashdump-elf.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c
index ba570eb..58fef9b 100644
--- a/kexec/crashdump-elf.c
+++ b/kexec/crashdump-elf.c
@@ -4,22 +4,20 @@
#endif
#if (ELF_WIDTH == 64)
-#define dfprintf_phdr(fh, prefix, phdr) \
+#define dprintf_phdr(prefix, phdr) \
do { \
- dfprintf((fh), \
- "%s: p_type = %u, p_offset = 0x%lx p_paddr = 0x%lx " \
- "p_vaddr = 0x%lx p_filesz = 0x%lx p_memsz = 0x%lx\n", \
- (prefix), (phdr)->p_type, (phdr)->p_offset, (phdr)->p_paddr, \
- (phdr)->p_vaddr, (phdr)->p_filesz, (phdr)->p_memsz); \
+ dprintf("%s: p_type = %u, p_offset = 0x%lx p_paddr = 0x%lx " \
+ "p_vaddr = 0x%lx p_filesz = 0x%lx p_memsz = 0x%lx\n", \
+ (prefix), (phdr)->p_type, (phdr)->p_offset, (phdr)->p_paddr, \
+ (phdr)->p_vaddr, (phdr)->p_filesz, (phdr)->p_memsz); \
} while(0)
#else
-#define dfprintf_phdr(fh, prefix, phdr) \
+#define dprintf_phdr(prefix, phdr) \
do { \
- dfprintf((fh), \
- "%s: p_type = %u, p_offset = 0x%x " "p_paddr = 0x%x " \
- "p_vaddr = 0x%x p_filesz = 0x%x p_memsz = 0x%x\n", \
- (prefix), (phdr)->p_type, (phdr)->p_offset, (phdr)->p_paddr, \
- (phdr)->p_vaddr, (phdr)->p_filesz, (phdr)->p_memsz); \
+ dprintf("%s: p_type = %u, p_offset = 0x%x " "p_paddr = 0x%x " \
+ "p_vaddr = 0x%x p_filesz = 0x%x p_memsz = 0x%x\n", \
+ (prefix), (phdr)->p_type, (phdr)->p_offset, (phdr)->p_paddr, \
+ (phdr)->p_vaddr, (phdr)->p_filesz, (phdr)->p_memsz); \
} while(0)
#endif
@@ -145,7 +143,7 @@ int FUNC(struct kexec_info *info,
/* Increment number of program headers. */
(elf->e_phnum)++;
- dfprintf_phdr(stdout, "Elf header", phdr);
+ dprintf_phdr("Elf header", phdr);
}
/* Setup an PT_LOAD type program header for the region where
@@ -162,7 +160,7 @@ int FUNC(struct kexec_info *info,
phdr->p_filesz = phdr->p_memsz = info->kern_size;
phdr->p_align = 0;
(elf->e_phnum)++;
- dfprintf_phdr(stdout, "Kernel text Elf header", phdr);
+ dprintf_phdr("Kernel text Elf header", phdr);
}
/* Setup PT_LOAD type program header for every system RAM chunk.
@@ -203,9 +201,9 @@ int FUNC(struct kexec_info *info,
/* Increment number of program headers. */
(elf->e_phnum)++;
- dfprintf_phdr(stdout, "Elf header", phdr);
+ dprintf_phdr("Elf header", phdr);
}
return 0;
}
-#undef dfprintf_phdr
+#undef dprintf_phdr