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

Browse source

Pull sparc updates from David Miller:
 "Nothing super serious:

   - Convert sparc32 over to NO_BOOTMEM (Mike Rapoport)

   - Use dma_noncoherent_ops on sparc32 (Christoph Hellwig)

   - Fix kbuild defconfig handling on sparc32 (Masahiro Yamada)"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32
  sparc32: split ramdisk detection and reservation to a helper function
  sparc32: switch to NO_BOOTMEM
  sparc: mm/init_32: kill trailing whitespace
  sparc: use generic dma_noncoherent_ops

...

This commit is contained in:

Linus Torvalds 2018-08-22 07:38:21 -07:00

parent 20a9e57a09 c84ca616b1

commit 9617ba395f

5 changed files with 88 additions and 249 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/sparc/Kconfig

View file

6

arch/sparc/Makefile

View file

5

arch/sparc/include/asm/dma-mapping.h

View file

195

arch/sparc/kernel/ioport.c

View file

127

arch/sparc/mm/init_32.c

View file