diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-21 11:33:09 +0900 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-21 11:33:09 +0900 |
commit | 1e5418c2535f4fddbbee4036750de41e16e0f7b0 (patch) | |
tree | 9f76c917b131c20d614b2c6cfa12853120e90d4b /include/linux/interrupt.h | |
parent | d8179bc0db8d0c9654d5de43de2874bf6d0a58fa (diff) | |
parent | f0ba3d05c9c647ab42ed6a0dbdfdeae42bfbd6de (diff) | |
download | linux-1e5418c2535f4fddbbee4036750de41e16e0f7b0.tar.gz linux-1e5418c2535f4fddbbee4036750de41e16e0f7b0.tar.bz2 linux-1e5418c2535f4fddbbee4036750de41e16e0f7b0.zip |
Merge branch 'irq/for-net' into irq/core
Reason: Import the change which might be pulled in from net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/interrupt.h')
-rw-r--r-- | include/linux/interrupt.h | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 051c85032f48..7785db3d34ae 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -199,6 +199,26 @@ extern int check_wakeup_irqs(void); static inline int check_wakeup_irqs(void) { return 0; } #endif +/** + * struct irq_affinity_notify - context for notification of IRQ affinity changes + * @irq: Interrupt to which notification applies + * @kref: Reference count, for internal use + * @work: Work item, for internal use + * @notify: Function to be called on change. This will be + * called in process context. + * @release: Function to be called on release. This will be + * called in process context. Once registered, the + * structure must only be freed when this function is + * called or later. + */ +struct irq_affinity_notify { + unsigned int irq; + struct kref kref; + struct work_struct work; + void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); + void (*release)(struct kref *ref); +}; + #if defined(CONFIG_SMP) extern cpumask_var_t irq_default_affinity; @@ -242,26 +262,6 @@ extern int irq_select_affinity(unsigned int irq); extern int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m); -/** - * struct irq_affinity_notify - context for notification of IRQ affinity changes - * @irq: Interrupt to which notification applies - * @kref: Reference count, for internal use - * @work: Work item, for internal use - * @notify: Function to be called on change. This will be - * called in process context. - * @release: Function to be called on release. This will be - * called in process context. Once registered, the - * structure must only be freed when this function is - * called or later. - */ -struct irq_affinity_notify { - unsigned int irq; - struct kref kref; - struct work_struct work; - void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); - void (*release)(struct kref *ref); -}; - extern int irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify); @@ -289,6 +289,12 @@ static inline int irq_set_affinity_hint(unsigned int irq, { return -EINVAL; } + +static inline int +irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify) +{ + return 0; +} #endif /* CONFIG_SMP */ /* |