diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 16:33:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 16:33:17 +0200 |
| commit | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 (patch) | |
| tree | 71a0143ae1196d088db354a8620c2efb23f0a062 /arch/sparc/kernel/prom_64.c | |
| parent | Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | sparc: fix format string argument for prom_printf() (diff) | |
| download | linux-a06cb1ae3cb64367c0fdc313c43ebb0558e51827.tar.xz linux-a06cb1ae3cb64367c0fdc313c43ebb0558e51827.zip | |
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/prom_64.c')
| -rw-r--r-- | arch/sparc/kernel/prom_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c index 340c5b976d28..d397d7fc5c28 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(); } |