summaryrefslogtreecommitdiff
path: root/include/linux/irq.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-09-21 12:54:44 +0300
committerThomas Gleixner <tglx@linutronix.de>2017-09-21 12:54:44 +0300
commit0551968add53777fddd18f4ffb4e3bbc1f646d79 (patch)
treeeb315949a2c7d412f0ea5b3e03e9489a1f828147 /include/linux/irq.h
parentc52f56a69d104d5294af3d652776d94b1ef6a175 (diff)
downloadlinux-0551968add53777fddd18f4ffb4e3bbc1f646d79.tar.xz
Revert "genirq: Restrict effective affinity to interrupts actually using it"
This reverts commit 74def747bcd09692bdbf8c6a15350795b0f11ca8. The change to the helper function is only correct for the /proc/irq/ readout usage, but breaks the existing x86 usage of that function. Reported-by: Yanko Kaneti <yaneti@declera.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r--include/linux/irq.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index b99a784635ff..d4728bf6a537 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -783,10 +783,7 @@ static inline struct cpumask *irq_data_get_affinity_mask(struct irq_data *d)
static inline
struct cpumask *irq_data_get_effective_affinity_mask(struct irq_data *d)
{
- if (!cpumask_empty(d->common->effective_affinity))
- return d->common->effective_affinity;
-
- return d->common->affinity;
+ return d->common->effective_affinity;
}
static inline void irq_data_update_effective_affinity(struct irq_data *d,
const struct cpumask *m)