diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-05-09 14:40:27 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2007-05-10 11:52:20 +0900 |
| commit | 13ceb63c96c26e1964dea12576d7245853a83842 (patch) | |
| tree | d38759d98ae1f3818aade6c500b216a1a25f5d7d /kexec/crashdump-elf.c | |
| parent | e6a23f7d355685f01f6a4ce7c9d37deb7458cf90 (diff) | |
kexec rename dprintf to dbgprintf
The recently introduce kexec debug routine dprintf clashes with an existing
libc symbol. Rename dprintf to dbgprintf.
Signed-off-by: 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.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c index 58fef9b..c048f75 100644 --- a/kexec/crashdump-elf.c +++ b/kexec/crashdump-elf.c @@ -4,17 +4,17 @@ #endif #if (ELF_WIDTH == 64) -#define dprintf_phdr(prefix, phdr) \ +#define dbgprintf_phdr(prefix, phdr) \ do { \ - dprintf("%s: p_type = %u, p_offset = 0x%lx p_paddr = 0x%lx " \ + dbgprintf("%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 dprintf_phdr(prefix, phdr) \ +#define dbgprintf_phdr(prefix, phdr) \ do { \ - dprintf("%s: p_type = %u, p_offset = 0x%x " "p_paddr = 0x%x " \ + dbgprintf("%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); \ @@ -143,7 +143,7 @@ int FUNC(struct kexec_info *info, /* Increment number of program headers. */ (elf->e_phnum)++; - dprintf_phdr("Elf header", phdr); + dbgprintf_phdr("Elf header", phdr); } /* Setup an PT_LOAD type program header for the region where @@ -160,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)++; - dprintf_phdr("Kernel text Elf header", phdr); + dbgprintf_phdr("Kernel text Elf header", phdr); } /* Setup PT_LOAD type program header for every system RAM chunk. @@ -201,9 +201,9 @@ int FUNC(struct kexec_info *info, /* Increment number of program headers. */ (elf->e_phnum)++; - dprintf_phdr("Elf header", phdr); + dbgprintf_phdr("Elf header", phdr); } return 0; } -#undef dprintf_phdr +#undef dbgprintf_phdr |