aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/irqdesc.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-11 18:49:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-11 18:49:31 +0100
commit805499a6d5d7b7fa8528170d1b2869ea88485f99 (patch)
tree03fc29f7f07709c267e8dad29e8ab8f85b24938b /include/linux/irqdesc.h
parent254c44ea822066e24ab5efbdff1e43b8fe45ae76 (diff)
parentaac4dd1dab8acfc244d697473d2a5f4424a5746c (diff)
downloadkernel_samsung_aries-805499a6d5d7b7fa8528170d1b2869ea88485f99.zip
kernel_samsung_aries-805499a6d5d7b7fa8528170d1b2869ea88485f99.tar.gz
kernel_samsung_aries-805499a6d5d7b7fa8528170d1b2869ea88485f99.tar.bz2
Merge branch 'irq-davinci' of git://gitorious.org/linux-davinci/linux-davinci into devel-stable
Diffstat (limited to 'include/linux/irqdesc.h')
-rw-r--r--include/linux/irqdesc.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index a082905..c70b1aa 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -16,16 +16,18 @@ struct timer_rand_state;
* @irq_data: per irq and chip data passed down to chip functions
* @timer_rand_state: pointer to timer rand state struct
* @kstat_irqs: irq stats per cpu
- * @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()]
+ * @handle_irq: highlevel irq-events handler
+ * @preflow_handler: handler called before the flow handler (currently used by sparc)
* @action: the irq action chain
* @status: status information
* @core_internal_state__do_not_mess_with_it: core internal status information
* @depth: disable-depth, for nested irq_disable() calls
- * @wake_depth: enable depth, for multiple set_irq_wake() callers
+ * @wake_depth: enable depth, for multiple irq_set_irq_wake() callers
* @irq_count: stats field to detect stalled irqs
* @last_unhandled: aging timer for unhandled count
* @irqs_unhandled: stats field for spurious unhandled interrupts
* @lock: locking for SMP
+ * @affinity_hint: hint to user space for preferred irq affinity
* @affinity_notify: context for notification of affinity changes
* @pending_mask: pending rebalanced interrupts
* @threads_oneshot: bitfield to handle shared oneshot threads