projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b0fdaa
)
[MIPS] R10000: Fix wrong test in dma-default.c
author
Maxime Bizon
<mbizon@freebox.fr>
Fri, 31 Aug 2007 09:03:14 +0000
(11:03 +0200)
committer
Ralf Baechle
<ralf@linux-mips.org>
Mon, 10 Sep 2007 20:25:28 +0000
(21:25 +0100)
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mm/dma-default.c
patch
|
blob
|
history
diff --git
a/arch/mips/mm/dma-default.c
b/arch/mips/mm/dma-default.c
index
76903c7
..
f60b3dc
100644
(file)
--- a/
arch/mips/mm/dma-default.c
+++ b/
arch/mips/mm/dma-default.c
@@
-35,7
+35,7
@@
static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
static inline int cpu_is_noncoherent_r10000(struct device *dev)
{
return !plat_device_is_coherent(dev) &&
- (current_cpu_data.cputype == CPU_R10000
&&
+ (current_cpu_data.cputype == CPU_R10000
||
current_cpu_data.cputype == CPU_R12000);
}