diff options
author | Sean MacLennan <smaclennan@pikatech.com> | 2009-06-10 11:09:23 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 00:15:44 -0400 |
commit | 79290e4b692af8a76273bab38e41a3a385dedc7b (patch) | |
tree | 887697231707ac381198027a12eb0bbbd704edd6 /arch | |
parent | 247608234e944e3e8e4d503c54c19ccb63dd27f2 (diff) |
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')
-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) | |||
43 | { | 43 | { |
44 | unsigned long root = of_get_flat_dt_root(); | 44 | unsigned long root = of_get_flat_dt_root(); |
45 | 45 | ||
46 | return of_flat_dt_is_compatible(root, "pika,warp"); | 46 | if (!of_flat_dt_is_compatible(root, "pika,warp")) |
47 | return 0; | ||
48 | |||
49 | /* For __dma_alloc_coherent */ | ||
50 | ISA_DMA_THRESHOLD = ~0L; | ||
51 | |||
52 | return 1; | ||
47 | } | 53 | } |
48 | 54 | ||
49 | define_machine(warp) { | 55 | define_machine(warp) { |