diff options
| author | Sean MacLennan <smaclennan@pikatech.com> | 2009-06-10 17:09:23 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 06:15:44 +0200 |
| commit | 79290e4b692af8a76273bab38e41a3a385dedc7b (patch) | |
| tree | 887697231707ac381198027a12eb0bbbd704edd6 /arch/powerpc/platforms/44x | |
| parent | powerpc/bootwrapper: Custom build options for XPedite52xx targets (diff) | |
| download | linux-79290e4b692af8a76273bab38e41a3a385dedc7b.tar.xz linux-79290e4b692af8a76273bab38e41a3a385dedc7b.zip | |
powerpc/warp: Fix ISA_DMA_THRESHOLD default
If no device is passed to __dma_alloc_coherent, it defaults to using ISA_DMA_THRESHOLD
for the mask. This patch provides a reasonable default rather than 0.
Signed-off-by: Sean MacLennan <smaclennan@pikatech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/44x')
| -rw-r--r-- | arch/powerpc/platforms/44x/warp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c index c5118802a281..42e09a9f77e2 100644 --- a/arch/powerpc/platforms/44x/warp.c +++ b/arch/powerpc/platforms/44x/warp.c @@ -43,7 +43,13 @@ static int __init warp_probe(void) { unsigned long root = of_get_flat_dt_root(); - return of_flat_dt_is_compatible(root, "pika,warp"); + if (!of_flat_dt_is_compatible(root, "pika,warp")) + return 0; + + /* For __dma_alloc_coherent */ + ISA_DMA_THRESHOLD = ~0L; + + return 1; } define_machine(warp) { |