Commit:     ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd
Parent:     3abf7afd406866a84276d3ed04f4edf6070c9cb5
Author:     David Howells <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 01:49:09 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 10:04:50 2007 -0700

    FRV: work around a possible compiler bug
    Work around a possible bug in the FRV compiler.
    What appears to be happening is that gcc resolves the
    __builtin_constant_p() in kmalloc() to true, but then fails to reduce the
    therefore constant conditions in the if-statements it guards to constant
    When compiling with -O2 or -Os, one single spurious error crops up in
    cpuup_callback() in mm/slab.c.  This can be avoided by making the memsize
    variable const.
    Signed-off-by: David Howells <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/frv/Makefile |    2 +-
 mm/slab.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/frv/Makefile b/arch/frv/Makefile
index 038e3a8..9bf7345 100644
--- a/arch/frv/Makefile
+++ b/arch/frv/Makefile
@@ -88,7 +88,7 @@ ASFLAGS               += -mno-fdpic
 # make sure the .S files get compiled with debug info
 # and disable optimisations that are unhelpful whilst debugging
-CFLAGS         += -O1
+#CFLAGS                += -O1
 AFLAGS         += -Wa,--gdwarf2
 ASFLAGS                += -Wa,--gdwarf2
diff --git a/mm/slab.c b/mm/slab.c
index 96d30ee..88bc633 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1163,7 +1163,7 @@ static int __cpuinit cpuup_callback(struct notifier_block 
        struct kmem_cache *cachep;
        struct kmem_list3 *l3 = NULL;
        int node = cpu_to_node(cpu);
-       int memsize = sizeof(struct kmem_list3);
+       const int memsize = sizeof(struct kmem_list3);
        switch (action) {
        case CPU_LOCK_ACQUIRE:
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to