On Sun, 25 May 2008 20:07:24 +0300, Adrian Bunk <adrian.bunk@xxxxxxxxx> wrote: > Commit 351336929ccf222ae38ff0cb7a8dd5fd5c6236a0 > ([MIPS] Allow setting of the cache attribute at run time.) > causes the following build error with pnx8550-jbs_defconfig > and pnx8550-stb810_defconfig: I wondered why the commit has my S-O-B, and finally found that I had fixed a section mismatch caused by the original patch (on queue tree on linux-mips.org) and Ralf had folded my fix into the original patch, with my S-O-B. Folding on the queue tree will be good on many case, but sometimes a bit confusing. :-) Anyway, here is a patch to fix the build failure. Thank you for reporting. ------------------------------------------------------ Subject: [PATCH] MIPS: Fix CONF_CM_DEFAULT build error From: Atsushi Nemoto <anemo@xxxxxxxxxxxxx> Signed-off-by: Atsushi Nemoto <anemo@xxxxxxxxxxxxx> --- diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 60e2f93..8a75677 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h @@ -134,6 +134,6 @@ #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) -#define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT) +#define CONF_CM_DEFAULT (_page_cachable_default >> _CACHE_SHIFT) #endif /* _ASM_PGTABLE_BITS_H */
