The patch titled
cleanup: uninline irq_enter() and move it into a function
has been removed from the -mm tree. Its filename is
cleanup-uninline-irq_enter-and-move-it-into-a.patch
This patch was dropped because an updated version was merged
------------------------------------------------------
Subject: cleanup: uninline irq_enter() and move it into a function
From: Ingo Molnar <mingo@xxxxxxx>
Uninline irq_enter(). [dynticks adds more stuff to it]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/hardirq.h | 7 +------
kernel/softirq.c | 10 ++++++++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff -puN include/linux/hardirq.h~cleanup-uninline-irq_enter-and-move-it-into-a include/linux/hardirq.h
--- a/include/linux/hardirq.h~cleanup-uninline-irq_enter-and-move-it-into-a
+++ a/include/linux/hardirq.h
@@ -106,12 +106,7 @@ static inline void account_system_vtime(
* always balanced, so the interrupted value of ->hardirq_context
* will always be restored.
*/
-#define irq_enter() \
- do { \
- account_system_vtime(current); \
- add_preempt_count(HARDIRQ_OFFSET); \
- trace_hardirq_enter(); \
- } while (0)
+extern void irq_enter(void);
/*
* Exit irq context without processing softirqs:
diff -puN kernel/softirq.c~cleanup-uninline-irq_enter-and-move-it-into-a kernel/softirq.c
--- a/kernel/softirq.c~cleanup-uninline-irq_enter-and-move-it-into-a
+++ a/kernel/softirq.c
@@ -273,6 +273,16 @@ EXPORT_SYMBOL(do_softirq);
#endif
+/*
+ * Enter an interrupt context.
+ */
+void irq_enter(void)
+{
+ account_system_vtime(current);
+ add_preempt_count(HARDIRQ_OFFSET);
+ trace_hardirq_enter();
+}
+
#ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED
# define invoke_softirq() __do_softirq()
#else
_
Patches currently in -mm which might be from mingo@xxxxxxx are
forcedeth-hardirq-lockdep-warning.patch
bonding-lockdep-annotation.patch
spinlock-debug-all-cpu-backtrace.patch
spinlock-debug-all-cpu-backtrace-fix.patch
spinlock-debug-all-cpu-backtrace-fix-2.patch
spinlock-debug-all-cpu-backtrace-fix-3.patch
remove-the-old-bd_mutex-lockdep-annotation.patch
new-bd_mutex-lockdep-annotation.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching.patch
sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.patch
cleanup-uninline-irq_enter-and-move-it-into-a.patch
dynticks-extend-next_timer_interrupt-to-use-a.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-state-tracking.patch
hrtimers-state-tracking-fix.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
clockevents-core.patch
clockevents-drivers-for-i386.patch
clockevents-drivers-for-i386-fix.patch
clockevents-drivers-for-i386-fix-2.patch
clockevents-drivers-for-i386-mystery-fix.patch
high-res-timers-core.patch
high-res-timers-core-fix.patch
high-res-timers-core-fix-2.patch
dynticks-core.patch
dynticks-core-nmi-watchdog-fix.patch
dynticks-core-nmi-watchdog-fix-2.patch
dynticks-core-fix-idle-time-accounting.patch
dyntick-add-nohz-stats-to-proc-stat.patch
dynticks-i386-arch-code.patch
high-res-timers-dynticks-enable-i386-support.patch
debugging-feature-timer-stats.patch
debugging-feature-timer-stats-fix.patch
detect-atomic-counter-underflows.patch
debug-shared-irqs.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch
vdso-print-fatal-signals.patch
vdso-improve-print_fatal_signals-support-by-adding-memory-maps.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
