diff options
| author | David Howells <dhowells@redhat.com> | 2007-07-19 01:49:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 10:04:50 -0700 |
| commit | ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd (patch) | |
| tree | 0c48aa948de8549a2b183c2ed3e5b338fa9730b7 | |
| parent | 3abf7afd406866a84276d3ed04f4edf6070c9cb5 (diff) | |
| download | blackbird-op-linux-ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd.tar.gz blackbird-op-linux-ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd.zip | |
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
results.
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 <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/frv/Makefile | 2 | ||||
| -rw-r--r-- | mm/slab.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/Makefile b/arch/frv/Makefile index 038e3a8457e0..9bf7345c5cc9 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 ifdef CONFIG_DEBUG_INFO -CFLAGS += -O1 +#CFLAGS += -O1 AFLAGS += -Wa,--gdwarf2 ASFLAGS += -Wa,--gdwarf2 endif diff --git a/mm/slab.c b/mm/slab.c index 96d30ee256ef..88bc6336ce3d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1163,7 +1163,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb, 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: |
