projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
irq.c
diff --git
a/arch/arm/kernel/irq.c
b/arch/arm/kernel/irq.c
index
7c81ec4
..
ad857ba
100644
(file)
--- a/
arch/arm/kernel/irq.c
+++ b/
arch/arm/kernel/irq.c
@@
-31,6
+31,7
@@
#include <linux/smp.h>
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/smp.h>
#include <linux/init.h>
#include <linux/seq_file.h>
+#include <linux/ratelimit.h>
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/kallsyms.h>
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/kallsyms.h>
@@
-82,7
+83,7
@@
void set_irq_flags(unsigned int irq, unsigned int iflags)
unsigned long clr = 0, set = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
if (irq >= nr_irqs) {
unsigned long clr = 0, set = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
if (irq >= nr_irqs) {
- pr
intk(KERN_ERR
"Trying to set irq flags for IRQ%d\n", irq);
+ pr
_err(
"Trying to set irq flags for IRQ%d\n", irq);
return;
}
return;
}
@@
-135,7
+136,6
@@
int __init arch_probe_nr_irqs(void)
#endif
#ifdef CONFIG_HOTPLUG_CPU
#endif
#ifdef CONFIG_HOTPLUG_CPU
-
static bool migrate_one_irq(struct irq_desc *desc)
{
struct irq_data *d = irq_desc_get_irq_data(desc);
static bool migrate_one_irq(struct irq_desc *desc)
{
struct irq_data *d = irq_desc_get_irq_data(desc);
@@
-187,8
+187,8
@@
void migrate_irqs(void)
affinity_broken = migrate_one_irq(desc);
raw_spin_unlock(&desc->lock);
affinity_broken = migrate_one_irq(desc);
raw_spin_unlock(&desc->lock);
- if (affinity_broken
&& printk_ratelimit()
)
- pr_warn("IRQ%u no longer affine to CPU%u\n",
+ if (affinity_broken)
+ pr_warn
_ratelimited
("IRQ%u no longer affine to CPU%u\n",
i, smp_processor_id());
}
i, smp_processor_id());
}