diff --git a/[refs] b/[refs]
index f88ccb752bc3..0c001fdd9c29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3abf7afd406866a84276d3ed04f4edf6070c9cb5
+refs/heads/master: ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd
diff --git a/trunk/arch/frv/Makefile b/trunk/arch/frv/Makefile
index 038e3a8457e0..9bf7345c5cc9 100644
--- a/trunk/arch/frv/Makefile
+++ b/trunk/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/trunk/mm/slab.c b/trunk/mm/slab.c
index 96d30ee256ef..88bc6336ce3d 100644
--- a/trunk/mm/slab.c
+++ b/trunk/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: