projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
[linux-2.6-block.git]
/
include
/
linux
/
irq.h
diff --git
a/include/linux/irq.h
b/include/linux/irq.h
index 27a67536511ef45907a4108c46983fa1977acb44..873e4ac11b813accc72c6699265b039f62e7c575 100644
(file)
--- a/
include/linux/irq.h
+++ b/
include/linux/irq.h
@@
-160,12
+160,10
@@
struct irq_2_iommu;
*/
struct irq_desc {
unsigned int irq;
*/
struct irq_desc {
unsigned int irq;
-#ifdef CONFIG_SPARSE_IRQ
struct timer_rand_state *timer_rand_state;
unsigned int *kstat_irqs;
struct timer_rand_state *timer_rand_state;
unsigned int *kstat_irqs;
-#
ifdef CONFIG_INTR_REMAP
+#ifdef CONFIG_INTR_REMAP
struct irq_2_iommu *irq_2_iommu;
struct irq_2_iommu *irq_2_iommu;
-# endif
#endif
irq_flow_handler_t handle_irq;
struct irq_chip *chip;
#endif
irq_flow_handler_t handle_irq;
struct irq_chip *chip;
@@
-202,12
+200,6
@@
extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc
extern struct irq_desc irq_desc[NR_IRQS];
#else /* CONFIG_SPARSE_IRQ */
extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
extern struct irq_desc irq_desc[NR_IRQS];
#else /* CONFIG_SPARSE_IRQ */
extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
-
-#define kstat_irqs_this_cpu(DESC) \
- ((DESC)->kstat_irqs[smp_processor_id()])
-#define kstat_incr_irqs_this_cpu(irqno, DESC) \
- ((DESC)->kstat_irqs[smp_processor_id()]++)
-
#endif /* CONFIG_SPARSE_IRQ */
extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);
#endif /* CONFIG_SPARSE_IRQ */
extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);
@@
-226,7
+218,6
@@
irq_remap_to_desc(unsigned int irq, struct irq_desc *desc)
* Migration helpers for obsolete names, they will go away:
*/
#define hw_interrupt_type irq_chip
* Migration helpers for obsolete names, they will go away:
*/
#define hw_interrupt_type irq_chip
-typedef struct irq_chip hw_irq_controller;
#define no_irq_type no_irq_chip
typedef struct irq_desc irq_desc_t;
#define no_irq_type no_irq_chip
typedef struct irq_desc irq_desc_t;
@@
-236,6
+227,7
@@
typedef struct irq_desc irq_desc_t;
#include <asm/hw_irq.h>
extern int setup_irq(unsigned int irq, struct irqaction *new);
#include <asm/hw_irq.h>
extern int setup_irq(unsigned int irq, struct irqaction *new);
+extern void remove_irq(unsigned int irq, struct irqaction *act);
#ifdef CONFIG_GENERIC_HARDIRQS
#ifdef CONFIG_GENERIC_HARDIRQS
@@
-280,7
+272,7
@@
static inline int irq_balancing_disabled(unsigned int irq)
}
/* Handle irq action chains: */
}
/* Handle irq action chains: */
-extern i
n
t handle_IRQ_event(unsigned int irq, struct irqaction *action);
+extern i
rqreturn_
t handle_IRQ_event(unsigned int irq, struct irqaction *action);
/*
* Built-in IRQ handlers for various IRQ types,
/*
* Built-in IRQ handlers for various IRQ types,
@@
-325,7
+317,7
@@
static inline void generic_handle_irq(unsigned int irq)
/* Handling of unhandled and spurious interrupts: */
extern void note_interrupt(unsigned int irq, struct irq_desc *desc,
/* Handling of unhandled and spurious interrupts: */
extern void note_interrupt(unsigned int irq, struct irq_desc *desc,
- i
n
t action_ret);
+ i
rqreturn_
t action_ret);
/* Resending of interrupts :*/
void check_irq_resend(struct irq_desc *desc, unsigned int irq);
/* Resending of interrupts :*/
void check_irq_resend(struct irq_desc *desc, unsigned int irq);