|
1425
|
1 Revert a broken commit that makes ifconfig panic the kernel.
|
|
|
2
|
|
|
3 commit 3f9b8520b06013939ad247ba08b69529b5f14be1
|
|
|
4 Author: Paul Mundt <lethal@linux-sh.org>
|
|
|
5 Date: Tue May 31 14:38:29 2011 +0900
|
|
|
6
|
|
|
7 sh64: Move from P1SEG to CAC_ADDR for consistent sync.
|
|
|
8
|
|
|
9 sh64 doesn't define a P1SEGADDR, resulting in a build failure. The proper
|
|
|
10 mapping can be attained for both sh32 and 64 via the CAC_ADDR macro, so
|
|
|
11 switch to that instead.
|
|
|
12
|
|
|
13 Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
|
|
14
|
|
|
15 diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
|
|
|
16 index 40733a9..f251b5f 100644
|
|
|
17 --- a/arch/sh/mm/consistent.c
|
|
|
18 +++ b/arch/sh/mm/consistent.c
|
|
|
19 @@ -82,7 +82,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
|
|
|
20 void *addr;
|
|
|
21
|
|
|
22 addr = __in_29bit_mode() ?
|
|
|
23 - (void *)CAC_ADDR((unsigned long)vaddr) : vaddr;
|
|
|
24 + (void *)P1SEGADDR((unsigned long)vaddr) : vaddr;
|
|
|
25
|
|
|
26 switch (direction) {
|
|
|
27 case DMA_FROM_DEVICE: /* invalidate only */
|
