Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 23:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

genirq: Move IRQ_POLL_INPROGRESS to core

Browse Source 
No users outside of core.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-02-07 20:55:35 +01:00
parent 6f91a52d9b
commit 6954b75b48
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/irq.h
View File

@ -69,7 +69,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq,
#define IRQ_SUSPENDED 0x04000000 /* IRQ has gone through suspend sequence */ #define IRQ_SUSPENDED 0x04000000 /* IRQ has gone through suspend sequence */
#define IRQ_ONESHOT 0x08000000 /* IRQ is not unmasked after hardirq */ #define IRQ_ONESHOT 0x08000000 /* IRQ is not unmasked after hardirq */
#define IRQ_NESTED_THREAD 0x10000000 /* IRQ is nested into another, no own handler thread */ #define IRQ_NESTED_THREAD 0x10000000 /* IRQ is nested into another, no own handler thread */
#define IRQ_POLL_INPROGRESS 0x20000000 /* IRQ poll is in progress */
#define IRQF_MODIFY_MASK \ #define IRQF_MODIFY_MASK \
(IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \ (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \

2
kernel/irq/chip.c
View File

@ -400,7 +400,7 @@ EXPORT_SYMBOL_GPL(handle_nested_irq);
static bool irq_check_poll(struct irq_desc *desc) static bool irq_check_poll(struct irq_desc *desc)
{ {
if (!(desc->status & IRQ_POLL_INPROGRESS)) if (!(desc->istate & IRQS_POLL_INPROGRESS))
return false; return false;
return irq_wait_for_poll(desc); return irq_wait_for_poll(desc);
} }

2
kernel/irq/internals.h
View File

@ -39,10 +39,12 @@ enum {
* IRQS_AUTODETECT - autodetection in progress * IRQS_AUTODETECT - autodetection in progress
* IRQS_SPURIOUS_DISABLED - was disabled due to spurious interrupt * IRQS_SPURIOUS_DISABLED - was disabled due to spurious interrupt
* detection * detection
* IRQS_POLL_INPROGRESS - polling in progress
*/ */
enum { enum {
IRQS_AUTODETECT = 0x00000001, IRQS_AUTODETECT = 0x00000001,
IRQS_SPURIOUS_DISABLED = 0x00000002, IRQS_SPURIOUS_DISABLED = 0x00000002,
IRQS_POLL_INPROGRESS = 0x00000008,
}; };
#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data) #define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)

6
kernel/irq/spurious.c
View File

@ -98,13 +98,13 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
} }
/* Mark it poll in progress */ /* Mark it poll in progress */
desc->status |= IRQ_POLL_INPROGRESS; desc->istate |= IRQS_POLL_INPROGRESS;
do { do {
if (handle_irq_event(desc) == IRQ_HANDLED) if (handle_irq_event(desc) == IRQ_HANDLED)
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
action = desc->action; action = desc->action;
} while ((desc->status & IRQ_PENDING) && action); } while ((desc->status & IRQ_PENDING) && action);
desc->status &= ~IRQ_POLL_INPROGRESS; desc->istate &= ~IRQS_POLL_INPROGRESS;
out: out:
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
return ret == IRQ_HANDLED; return ret == IRQ_HANDLED;
@ -259,7 +259,7 @@ try_misrouted_irq(unsigned int irq, struct irq_desc *desc,
void note_interrupt(unsigned int irq, struct irq_desc *desc, void note_interrupt(unsigned int irq, struct irq_desc *desc,
irqreturn_t action_ret) irqreturn_t action_ret)
{ {
if (desc->status & IRQ_POLL_INPROGRESS) if (desc->istate & IRQS_POLL_INPROGRESS)
return; return;
if (unlikely(action_ret != IRQ_HANDLED)) { if (unlikely(action_ret != IRQ_HANDLED)) {