diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:33:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:33:17 -0700 |
| commit | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 (patch) | |
| tree | 71a0143ae1196d088db354a8620c2efb23f0a062 /arch/sparc/kernel | |
| parent | 56d92aa5cf7c96c70f81d0350c94faf46a9fb76d (diff) | |
| parent | 5da444aae54f64575a60f1d596ed7706e3089fb0 (diff) | |
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.
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/hvapi.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_64.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/traps_64.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/hvapi.c b/arch/sparc/kernel/hvapi.c index 1032df43ec9..c0a2de0fd62 100644 --- a/arch/sparc/kernel/hvapi.c +++ b/arch/sparc/kernel/hvapi.c @@ -194,7 +194,7 @@ void __init sun4v_hvapi_init(void) bad: prom_printf("HVAPI: Cannot register API group " - "%lx with major(%u) minor(%u)\n", + "%lx with major(%lu) minor(%lu)\n", group, major, minor); prom_halt(); } diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c index 340c5b976d2..d397d7fc5c2 100644 --- a/arch/sparc/kernel/prom_64.c +++ b/arch/sparc/kernel/prom_64.c @@ -37,7 +37,7 @@ void * __init prom_early_alloc(unsigned long size) void *ret; if (!paddr) { - prom_printf("prom_early_alloc(%lu) failed\n"); + prom_printf("prom_early_alloc(%lu) failed\n", size); prom_halt(); } diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 3b05e669771..fa1f1d375ff 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c @@ -850,7 +850,7 @@ void __init cheetah_ecache_flush_init(void) ecache_flush_physbase = find_ecache_flush_span(ecache_flush_size); 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", ecache_flush_size); prom_halt(); |