summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2007-05-09 14:40:20 -0700
committerSimon Horman <horms@verge.net.au>2007-05-10 11:52:16 +0900
commite6a23f7d355685f01f6a4ce7c9d37deb7458cf90 (patch)
tree760a3f032b35829571a0fc1d896f276be600e85e
parentf7129ad11f75ef27416784c39c29b0e8906d8844 (diff)
downloadkexec-tools-e6a23f7d355685f01f6a4ce7c9d37deb7458cf90.tar.gz
kexec remove last remaining dfprintf
Remove the last remaining dfprintf call and remove the dfprintf definition. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--kexec/arch/ppc64/kexec-ppc64.c2
-rw-r--r--kexec/kexec.h7
2 files changed, 4 insertions, 5 deletions
diff --git a/kexec/arch/ppc64/kexec-ppc64.c b/kexec/arch/ppc64/kexec-ppc64.c
index b8cd2a9..71cf7e5 100644
--- a/kexec/arch/ppc64/kexec-ppc64.c
+++ b/kexec/arch/ppc64/kexec-ppc64.c
@@ -207,7 +207,7 @@ static int get_base_ranges(void)
((unsigned long long *)buf)[1];
base_memory_range[local_memory_ranges].type = RANGE_RAM;
local_memory_ranges++;
- dfprintf(stderr, "%016llx-%016llx : %x\n",
+ dprintf("%016llx-%016llx : %x\n",
base_memory_range[local_memory_ranges-1].start,
base_memory_range[local_memory_ranges-1].end,
base_memory_range[local_memory_ranges-1].type);
diff --git a/kexec/kexec.h b/kexec/kexec.h
index d54dd80..6bb81a0 100644
--- a/kexec/kexec.h
+++ b/kexec/kexec.h
@@ -217,12 +217,11 @@ int parse_iomem_single(char *str, uint64_t *start, uint64_t *end);
#define MAX_LINE 160
-#define dprintf(args...) dfprintf(stdout, args)
#ifdef DEBUG
-#define dfprintf(_f, _args...) do {fprintf(_f, _args);} while(0)
+#define dprintf(_args...) do {printf(_args);} while(0)
#else
-static inline int __attribute__ ((format (printf, 2, 3)))
- dfprintf(FILE *f, const char *fmt, ...) {return 0;}
+static inline int __attribute__ ((format (printf, 1, 2)))
+ dprintf(const char *fmt, ...) {return 0;}
#endif
#endif /* KEXEC_H */