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

Commit a06cb1ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "Some quick fixes after today's merge-window pull"

 1) Add missing dependency on Sparc DES driver, oops.  From Dave Jones.

 2) Tell GCC that prom_printf() is printf-like and fix the few
    resultiing warnings.  From Akinobu Mita.

 3) Niagara-2 memcpy doesn't provide it's return value correctly in some
    circumstances.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix format string argument for prom_printf()
  crypto: Build SPARC DES algorithms on SPARC only.
  sparc64: Fix return value of Niagara-2 memcpy.
parents 56d92aa5 5da444aa

arch/sparc/include/asm/oplib_32.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ extern int prom_getprev(void); 
extern void prom_console_write_buf(const char *buf, int len);

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





/* 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(const char *fmt, ...);

extern __printf(1, 2) 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/include/asm/oplib_64.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size); 
extern void prom_console_write_buf(const char *buf, int len);

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





/* 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(const char *fmt, ...);

extern __printf(1, 2) 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/kernel/hvapi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ void __init sun4v_hvapi_init(void) 




bad:

bad:

	prom_printf("HVAPI: Cannot register API group "

	prom_printf("HVAPI: Cannot register API group "

		    "%lx with major(%u) minor(%u)\n",

		    "%lx with major(%lu) minor(%lu)\n",

		    group, major, minor);

		    group, major, minor);

	prom_halt();

	prom_halt();

}
 
}

arch/sparc/kernel/prom_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ void * __init prom_early_alloc(unsigned long size) 
	void *ret;

	void *ret;





	if (!paddr) {

	if (!paddr) {

		prom_printf("prom_early_alloc(%lu) failed\n");

		prom_printf("prom_early_alloc(%lu) failed\n", size);

		prom_halt();

		prom_halt();

	}

	}

arch/sparc/kernel/traps_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -850,7 +850,7 @@ void __init cheetah_ecache_flush_init(void) 
	ecache_flush_physbase = find_ecache_flush_span(ecache_flush_size);

	ecache_flush_physbase = find_ecache_flush_span(ecache_flush_size);





	if (ecache_flush_physbase == ~0UL) {

	if (ecache_flush_physbase == ~0UL) {

		prom_printf("cheetah_ecache_flush_init: Cannot find %d byte "

		prom_printf("cheetah_ecache_flush_init: Cannot find %ld byte "

			    "contiguous physical memory.\n",

			    "contiguous physical memory.\n",

			    ecache_flush_size);

			    ecache_flush_size);

		prom_halt();

		prom_halt();