[git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2009-05-27T06:41:21Z

Hi Linus

And here's the rest of the fixes I was talking about. Hopefully that
should bring back all non-coherent DMA platforms into proper working
conditions. It's a bit invasive so late in the process but it's been
reasonably well tested for a few days.

The following changes since commit cd86a536c81e9300d984327517548ca0652eebf9:
Linus Torvalds (1):
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (4):
Revert "powerpc: Rework dma-noncoherent to use generic vmalloc layer"
powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm
powerpc: Minor cleanups of kernel virt address space definitions
powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.

arch/powerpc/Kconfig | 12 +
arch/powerpc/include/asm/dma-mapping.h | 6 +-
arch/powerpc/include/asm/fixmap.h | 4 +-
arch/powerpc/include/asm/pgtable-ppc32.h | 26 ++-
arch/powerpc/kernel/dma.c | 2 +-
arch/powerpc/lib/Makefile | 1 -
arch/powerpc/lib/dma-noncoherent.c | 237 ------------------
arch/powerpc/mm/Makefile | 1 +
arch/powerpc/mm/dma-noncoherent.c | 400 ++++++++++++++++++++++++++++++
arch/powerpc/mm/init_32.c | 8 +-
arch/powerpc/mm/mem.c | 17 ++
arch/powerpc/mm/pgtable_32.c | 2 -
12 files changed, 463 insertions(+), 253 deletions(-)
delete mode 100644 arch/powerpc/lib/dma-noncoherent.c
create mode 100644 arch/powerpc/mm/dma-noncoherent.c