mips: CONF_CM_DEFAULT build error

mips: CONF_CM_DEFAULT build error

[Adrian Bunk]

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:

<--  snip  -->

...
  CC      arch/mips/nxp/pnx8550/stb810/board_setup.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/nxp/pnx8550/stb810/board_setup.c: In function 'board_setup':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/nxp/pnx8550/stb810/board_setup.c:42: error: 'PAGE_CACHABLE_DEFAULT' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/nxp/pnx8550/stb810/board_setup.c:42: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/nxp/pnx8550/stb810/board_setup.c:42: error: for each function it appears in.)
make[2]: *** [arch/mips/nxp/pnx8550/stb810/board_setup.o] Error 1

<--  snip  -->


The problem is due to the following:

$ grep -r CONF_CM_DEFAULT *
arch/mips/nxp/pnx8550/jbs/board_setup.c:        config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
arch/mips/nxp/pnx8550/jbs/board_setup.c:                        (CONF_CM_DEFAULT<<28));
arch/mips/nxp/pnx8550/stb810/board_setup.c:     config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
arch/mips/nxp/pnx8550/stb810/board_setup.c:                     (CONF_CM_DEFAULT<<28));
include/asm-mips/pgtable-bits.h:#define CONF_CM_DEFAULT         (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT)
$ grep -r PAGE_CACHABLE_DEFAULT *
include/asm-mips/pgtable-bits.h:#define CONF_CM_DEFAULT         (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT)
$ 


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: mips: CONF_CM_DEFAULT build error

[Atsushi Nemoto]

On Sun, 25 May 2008 20:07:24 +0300, Adrian Bunk <adrian.bunk@movial.fi> 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@mba.ocn.ne.jp>

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
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 */

Re: mips: CONF_CM_DEFAULT build error

[Ralf Baechle]

On Mon, Jun 02, 2008 at 01:28:14AM +0900, Atsushi Nemoto 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. :-)

Yes, I try to merge any follow on patches into the original patch as long
as that one is still sitting in the patch queue.  Since that result in
bugs getting fixes before they ever show up in any of the more static
trees, that is the MIPS or kernel.org git trees there is little point in
documenting bugs "that never existed" and their "non-fixes" ;-)

  Ralf