Mercurial > hg > aboriginal
view sources/patches/linux-sh4-fixifconfig.patch @ 1633:a4823c561e28
Patrick Lauer suggested making the smoketest timeout configurable, and default to 3 minutes when FORK=1.
author | Rob Landley <rob@landley.net> |
---|---|
date | Tue, 15 Oct 2013 22:25:55 -0500 |
parents | e67a999e0351 |
children |
line wrap: on
line source
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 */