Commit e6019db5 authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[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: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a58dfbbb

arch/ppc64/boot/main.c

+0 −1
Original line number Diff line number Diff line
@@ -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 *);

arch/ppc64/boot/prom.c

+2 −14
Original line number Diff line number Diff line
@@ -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, ...)

{