The patch titled
make noirqdebug/irqfixup __read_mostly, add (un)likely()
has been removed from the -mm tree. Its filename is
make-noirqdebug-irqfixup-__read_mostly-add-unlikely.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: make noirqdebug/irqfixup __read_mostly, add (un)likely()
From: Andreas Mohr <andi@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andreas Mohr <andi@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/arm/kernel/irq.c | 4 ++--
kernel/irq/spurious.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff -puN arch/arm/kernel/irq.c~make-noirqdebug-irqfixup-__read_mostly-add-unlikely arch/arm/kernel/irq.c
--- a/arch/arm/kernel/irq.c~make-noirqdebug-irqfixup-__read_mostly-add-unlikely
+++ a/arch/arm/kernel/irq.c
@@ -52,7 +52,7 @@
*/
#define MAX_IRQ_CNT 100000
-static int noirqdebug;
+static int noirqdebug __read_mostly;
static volatile unsigned long irq_err_count;
static DEFINE_SPINLOCK(irq_controller_lock);
static LIST_HEAD(irq_pending);
@@ -81,7 +81,7 @@ irqreturn_t no_action(int irq, void *dev
void do_bad_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
{
- irq_err_count += 1;
+ irq_err_count++;
printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq);
}
diff -puN kernel/irq/spurious.c~make-noirqdebug-irqfixup-__read_mostly-add-unlikely kernel/irq/spurious.c
--- a/kernel/irq/spurious.c~make-noirqdebug-irqfixup-__read_mostly-add-unlikely
+++ a/kernel/irq/spurious.c
@@ -11,7 +11,7 @@
#include <linux/kallsyms.h>
#include <linux/interrupt.h>
-static int irqfixup;
+static int irqfixup __read_mostly;
/*
* Recovery handler for misrouted interrupts.
@@ -136,9 +136,9 @@ static void report_bad_irq(unsigned int
void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret,
struct pt_regs *regs)
{
- if (action_ret != IRQ_HANDLED) {
+ if (unlikely(action_ret != IRQ_HANDLED)) {
desc->irqs_unhandled++;
- if (action_ret != IRQ_NONE)
+ if (unlikely(action_ret != IRQ_NONE))
report_bad_irq(irq, desc, action_ret);
}
@@ -152,11 +152,11 @@ void note_interrupt(unsigned int irq, ir
}
desc->irq_count++;
- if (desc->irq_count < 100000)
+ if (likely(desc->irq_count < 100000))
return;
desc->irq_count = 0;
- if (desc->irqs_unhandled > 99900) {
+ if (unlikely(desc->irqs_unhandled > 99900)) {
/*
* The interrupt is stuck
*/
@@ -171,7 +171,7 @@ void note_interrupt(unsigned int irq, ir
desc->irqs_unhandled = 0;
}
-int noirqdebug;
+int noirqdebug __read_mostly;
int __init noirqdebug_setup(char *str)
{
_
Patches currently in -mm which might be from andi@xxxxxxxxxxxxxxxxxxxxxxx are
origin.patch
cpu_relax-use-in-acpi-lock.patch
git-input.patch
ni5010-netcard-cleanup.patch
acx1xx-wireless-driver.patch
x86-constify-some-parts-of-arch-i386-kernel-cpu.patch
cpu_relax-smpbootc.patch
make-debug_mutex_on-__read_mostly.patch
constify-parts-of-kernel-power.patch
constify-libcrc32c-table.patch
make-pmtmr_ioport-__read_mostly.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
