From: Olaf Hering Date: Tue, 28 Jun 2005 11:01:35 +0000 (+1000) Subject: [PATCH] remove printk usage in arch/ppc64/boot/prom.c X-Git-Tag: v2.6.13-rc2~38^2~18 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6019db5a7f110839c62cefc073b6dc1143d6403;p=linux-2.6-omap-h63xx.git [PATCH] remove printk usage in arch/ppc64/boot/prom.c remove the printk usage in the zImage. we are not there, yet. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras --- diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c index da12ea2ca46..677e4187497 100644 --- a/arch/ppc64/boot/main.c +++ b/arch/ppc64/boot/main.c @@ -17,7 +17,6 @@ extern void *finddevice(const char *); extern int getprop(void *, const char *, void *, int); -extern void printk(char *fmt, ...); extern void printf(const char *fmt, ...); extern int sprintf(char *buf, const char *fmt, ...); void gunzip(void *, int, unsigned char *, int *); diff --git a/arch/ppc64/boot/prom.c b/arch/ppc64/boot/prom.c index d5218b15824..5e48b80ff5a 100644 --- a/arch/ppc64/boot/prom.c +++ b/arch/ppc64/boot/prom.c @@ -40,7 +40,7 @@ void *finddevice(const char *name); int getprop(void *phandle, const char *name, void *buf, int buflen); void chrpboot(int a1, int a2, void *prom); /* in main.c */ -void printk(char *fmt, ...); +int printf(char *fmt, ...); /* there is no convenient header to get this from... -- paulus */ extern unsigned long strlen(const char *); @@ -220,7 +220,7 @@ readchar(void) case 1: return ch; case -1: - printk("read(stdin) returned -1\r\n"); + printf("read(stdin) returned -1\r\n"); return -1; } } @@ -627,18 +627,6 @@ int sprintf(char * buf, const char *fmt, ...) static char sprint_buf[1024]; -void -printk(char *fmt, ...) -{ - va_list args; - int n; - - va_start(args, fmt); - n = vsprintf(sprint_buf, fmt, args); - va_end(args); - write(stdout, sprint_buf, n); -} - int printf(char *fmt, ...) {