Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe6c3dd authored by Robert Reif's avatar Robert Reif Committed by David S. Miller
Browse files

sparc: Use sparc64 version of prom/printf.c 



Use sparc64 version of prom/printf.c.

The only differences for sparc32 is that prom_printf is no longer
exported for modules which should be OK.

Signed-off-by: default avatarRobert Reif <reif@earthlink.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89b409f7

arch/sparc/include/asm/oplib_32.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ extern char prom_getchar(void); 
extern void prom_putchar(char character);

extern void prom_putchar(char character);





/* Prom's internal routines, don't use in kernel/boot code. */

/* Prom's internal routines, don't use in kernel/boot code. */

extern void prom_printf(char *fmt, ...);

extern void prom_printf(const char *fmt, ...);

extern void prom_write(const char *buf, unsigned int len);

extern void prom_write(const char *buf, unsigned int len);





/* Multiprocessor operations... */

/* Multiprocessor operations... */

arch/sparc/prom/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ lib-$(CONFIG_SPARC32) += palloc.o 
lib-$(CONFIG_SPARC32) += ranges.o

lib-$(CONFIG_SPARC32) += ranges.o

lib-$(CONFIG_SPARC32) += segment.o

lib-$(CONFIG_SPARC32) += segment.o

lib-y                 += console_$(BITS).o

lib-y                 += console_$(BITS).o

lib-y                 += printf_$(BITS).o

lib-y                 += printf.o

lib-y                 += tree_$(BITS).o

lib-y                 += tree_$(BITS).o

lib-$(CONFIG_SPARC64) += p1275.o

lib-$(CONFIG_SPARC64) += p1275.o

lib-$(CONFIG_SPARC64) += cif.o
 
lib-$(CONFIG_SPARC64) += cif.o

arch/sparc/prom/printf_64.c→arch/sparc/prom/printf.c

+0 −0

File moved.

View file

arch/sparc/prom/printf_32.c

deleted100644 → 0
+0 −48
Original line number Original line Diff line number Diff line 
/*

 * printf.c:  Internal prom library printf facility.

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (c) 2002 Pete Zaitcev (zaitcev@yahoo.com)

 *

 * We used to warn all over the code: DO NOT USE prom_printf(),

 * and yet people do. Anton's banking code was outputting banks

 * with prom_printf for most of the 2.4 lifetime. Since an effective

 * stick is not available, we deployed a carrot: an early printk

 * through PROM by means of -p boot option. This ought to fix it.

 * USE printk; if you need, deploy -p.

 */



#include <linux/kernel.h>

#include <linux/module.h>



#include <asm/openprom.h>

#include <asm/oplib.h>



static char ppbuf[1024];



void

prom_write(const char *buf, unsigned int n)

{

	char ch;



	while (n != 0) {

		--n;

		if ((ch = *buf++) == '\n')

			prom_putchar('\r');

		prom_putchar(ch);

	}

}



void

prom_printf(char *fmt, ...)

{

	va_list args;

	int i;



	va_start(args, fmt);

	i = vscnprintf(ppbuf, sizeof(ppbuf), fmt, args);

	va_end(args);



	prom_write(ppbuf, i);

}

EXPORT_SYMBOL(prom_printf);