projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix memory ordering problem in wake_futex()
[powerpc.git]
/
kernel
/
irq
/
manage.c
diff --git
a/kernel/irq/manage.c
b/kernel/irq/manage.c
index
1cfdb08
..
81c49a4
100644
(file)
--- a/
kernel/irq/manage.c
+++ b/
kernel/irq/manage.c
@@
-24,6
+24,7
@@
cpumask_t __cacheline_aligned pending_irq_cpumask[NR_IRQS];
/**
* synchronize_irq - wait for pending IRQ handlers (on other CPUs)
/**
* synchronize_irq - wait for pending IRQ handlers (on other CPUs)
+ * @irq: interrupt number to wait for
*
* This function waits for any pending IRQ handlers for this interrupt
* to complete before returning. If you use this function while
*
* This function waits for any pending IRQ handlers for this interrupt
* to complete before returning. If you use this function while
@@
-35,6
+36,9
@@
void synchronize_irq(unsigned int irq)
{
struct irq_desc *desc = irq_desc + irq;
{
struct irq_desc *desc = irq_desc + irq;
+ if (irq >= NR_IRQS)
+ return;
+
while (desc->status & IRQ_INPROGRESS)
cpu_relax();
}
while (desc->status & IRQ_INPROGRESS)
cpu_relax();
}
@@
-59,6
+63,9
@@
void disable_irq_nosync(unsigned int irq)
irq_desc_t *desc = irq_desc + irq;
unsigned long flags;
irq_desc_t *desc = irq_desc + irq;
unsigned long flags;
+ if (irq >= NR_IRQS)
+ return;
+
spin_lock_irqsave(&desc->lock, flags);
if (!desc->depth++) {
desc->status |= IRQ_DISABLED;
spin_lock_irqsave(&desc->lock, flags);
if (!desc->depth++) {
desc->status |= IRQ_DISABLED;
@@
-85,6
+92,9
@@
void disable_irq(unsigned int irq)
{
irq_desc_t *desc = irq_desc + irq;
{
irq_desc_t *desc = irq_desc + irq;
+ if (irq >= NR_IRQS)
+ return;
+
disable_irq_nosync(irq);
if (desc->action)
synchronize_irq(irq);
disable_irq_nosync(irq);
if (desc->action)
synchronize_irq(irq);
@@
-107,6
+117,9
@@
void enable_irq(unsigned int irq)
irq_desc_t *desc = irq_desc + irq;
unsigned long flags;
irq_desc_t *desc = irq_desc + irq;
unsigned long flags;
+ if (irq >= NR_IRQS)
+ return;
+
spin_lock_irqsave(&desc->lock, flags);
switch (desc->depth) {
case 0:
spin_lock_irqsave(&desc->lock, flags);
switch (desc->depth) {
case 0:
@@
-162,6
+175,9
@@
int setup_irq(unsigned int irq, struct irqaction * new)
unsigned long flags;
int shared = 0;
unsigned long flags;
int shared = 0;
+ if (irq >= NR_IRQS)
+ return -EINVAL;
+
if (desc->handler == &no_irq_type)
return -ENOSYS;
/*
if (desc->handler == &no_irq_type)
return -ENOSYS;
/*