Subject: [merged] smph-use-local_irq_saverestore-in-smp-version-of-on_each_cpu.patch removed from -mm tree
To: david.daney@xxxxxxxxxx,ralf@xxxxxxxxxxxxxx,rostedt@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 17 Jun 2013 13:10:52 -0700
The patch titled
Subject: smp.h: use local_irq_{save,restore}() in !SMP version of on_each_cpu().
has been removed from the -mm tree. Its filename was
smph-use-local_irq_saverestore-in-smp-version-of-on_each_cpu.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Daney <david.daney@xxxxxxxxxx>
Subject: smp.h: use local_irq_{save,restore}() in !SMP version of on_each_cpu().
Thanks to commit f91eb62f71b ("init: scream bloody murder if interrupts
are enabled too early"), "bloody murder" is now being screamed.
With a MIPS OCTEON config, we use on_each_cpu() in our
irq_chip.irq_bus_sync_unlock() function. This gets called in early as a
result of the time_init() call. Because the !SMP version of on_each_cpu()
unconditionally enables irqs, we get:
WARNING: at init/main.c:560 start_kernel+0x250/0x410()
Interrupts were enabled early
Modules linked in:
CPU: 0 PID: 0 Comm: swapper Not tainted 3.10.0-rc5-Cavium-Octeon+ #801
Stack : 0000000000000046 ffffffff808e0000 0000000000000006 0000000000000004
0000000000000001 0000000000000000 0000000000000046 0000000000000000
ffffffff80a90000 ffffffff8015c020 0000000000000000 ffffffff8015c020
ffffffff80a79f70 ffffffff80a80000 ffffffff8072b9c0 ffffffff808a7d77
ffffffff80a79f70 ffffffff808a8168 0000000000000000 00000004178a9948
0000000417801230 ffffffff805f7610 0000000010000078 ffffffff805fa01c
ffffffff8089bd18 ffffffff801595fc ffffffff8089bd28 ffffffff8015d384
ffffffff808a7e80 ffffffff8089bc30 0000000000000000 ffffffff80159710
0000000000000000 0000000000000000 0000000000000000 0000000000000000
0000000000000000 ffffffff80139520 0000000000000000 0000000000000009
...
Call Trace:
[<ffffffff80139520>] show_stack+0x68/0x80
[<ffffffff80159710>] warn_slowpath_common+0x78/0xb0
[<ffffffff801597e8>] warn_slowpath_fmt+0x38/0x48
[<ffffffff8092b768>] start_kernel+0x250/0x410
Suggested fix: Do what we already do in the SMP version of on_each_cpu(),
and use local_irq_save/local_irq_restore. Because we need a flags
variable, make it a static inline to avoid name space issues.
Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/smp.h | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff -puN include/linux/smp.h~smph-use-local_irq_saverestore-in-smp-version-of-on_each_cpu include/linux/smp.h
--- a/include/linux/smp.h~smph-use-local_irq_saverestore-in-smp-version-of-on_each_cpu
+++ a/include/linux/smp.h
@@ -11,6 +11,7 @@
#include <linux/list.h>
#include <linux/cpumask.h>
#include <linux/init.h>
+#include <linux/irqflags.h>
extern void cpu_idle(void);
@@ -139,13 +140,17 @@ static inline int up_smp_call_function(s
}
#define smp_call_function(func, info, wait) \
(up_smp_call_function(func, info))
-#define on_each_cpu(func,info,wait) \
- ({ \
- local_irq_disable(); \
- func(info); \
- local_irq_enable(); \
- 0; \
- })
+
+static inline int on_each_cpu(smp_call_func_t func, void *info, int wait)
+{
+ unsigned long flags;
+
+ local_irq_save(flags);
+ func(info);
+ local_irq_restore(flags);
+ return 0;
+}
+
/*
* Note we still need to test the mask even for UP
* because we actually can get an empty mask from
_
Patches currently in -mm which might be from david.daney@xxxxxxxxxx are
linux-next.patch
mm-mips-prepare-for-removing-num_physpages-and-simplify-mem_init.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
