Mercurial > hg > aboriginal
changeset 1425:e67a999e0351
Revert sh4 breakage.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 07 Aug 2011 04:18:21 -0500 |
parents | 898dcfab2d4b |
children | 14739f3ae2a5 |
files | sources/patches/linux-sh4-fixifconfig.patch |
diffstat | 1 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/linux-sh4-fixifconfig.patch Sun Aug 07 04:18:21 2011 -0500 @@ -0,0 +1,27 @@ +Revert a broken commit that makes ifconfig panic the kernel. + +commit 3f9b8520b06013939ad247ba08b69529b5f14be1 +Author: Paul Mundt <lethal@linux-sh.org> +Date: Tue May 31 14:38:29 2011 +0900 + + sh64: Move from P1SEG to CAC_ADDR for consistent sync. + + sh64 doesn't define a P1SEGADDR, resulting in a build failure. The proper + mapping can be attained for both sh32 and 64 via the CAC_ADDR macro, so + switch to that instead. + + Signed-off-by: Paul Mundt <lethal@linux-sh.org> + +diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c +index 40733a9..f251b5f 100644 +--- a/arch/sh/mm/consistent.c ++++ b/arch/sh/mm/consistent.c +@@ -82,7 +82,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, + void *addr; + + addr = __in_29bit_mode() ? +- (void *)CAC_ADDR((unsigned long)vaddr) : vaddr; ++ (void *)P1SEGADDR((unsigned long)vaddr) : vaddr; + + switch (direction) { + case DMA_FROM_DEVICE: /* invalidate only */