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.
Showing
- arch/sparc/include/asm/oplib_32.h 1 addition, 1 deletionarch/sparc/include/asm/oplib_32.h
- arch/sparc/include/asm/oplib_64.h 1 addition, 1 deletionarch/sparc/include/asm/oplib_64.h
- arch/sparc/kernel/hvapi.c 1 addition, 1 deletionarch/sparc/kernel/hvapi.c
- arch/sparc/kernel/prom_64.c 1 addition, 1 deletionarch/sparc/kernel/prom_64.c
- arch/sparc/kernel/traps_64.c 1 addition, 1 deletionarch/sparc/kernel/traps_64.c
- arch/sparc/lib/NG2memcpy.S 23 additions, 23 deletionsarch/sparc/lib/NG2memcpy.S
- arch/sparc/mm/init_64.c 4 additions, 3 deletionsarch/sparc/mm/init_64.c
- arch/sparc/mm/iommu.c 2 additions, 2 deletionsarch/sparc/mm/iommu.c
- crypto/Kconfig 1 addition, 0 deletionscrypto/Kconfig
Please register or sign in to comment