Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Browse source

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.
  powerpc: Minor cleanups of kernel virt address space definitions
  powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm
  Revert "powerpc: Rework dma-noncoherent to use generic vmalloc layer"

...

This commit is contained in:

Linus Torvalds 2009-05-27 10:58:23 -07:00

parent 911e690e70 8b31e49d1d

commit b14f3bd90d

12 changed files with 463 additions and 253 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

12

arch/powerpc/Kconfig

View file

6

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

View file

4

arch/powerpc/include/asm/fixmap.h

View file

26

arch/powerpc/include/asm/pgtable-ppc32.h

View file

2

arch/powerpc/kernel/dma.c

View file

1

arch/powerpc/lib/Makefile

View file

237

arch/powerpc/lib/dma-noncoherent.c

View file

1

arch/powerpc/mm/Makefile

View file

400

arch/powerpc/mm/dma-noncoherent.c

View file

8

arch/powerpc/mm/init_32.c

View file

17

arch/powerpc/mm/mem.c

View file

2

arch/powerpc/mm/pgtable_32.c

View file