projects/linux·commit 3f017a4c

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

3f017a4c · Linus Torvalds <[email protected]> · 2014-05-20 14:18:04 +09:00

Pull irq fixes from Thomas Gleixner:
 "Two small updates from the irq departement:

   - Provide missing inline stub for a SMP only function

   - Add sub-maintainer for the drivers/irqchip/ part of the irq
     subsystem.  YAY!"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Add co-maintainer for drivers/irqchip
  genirq: Provide irq_force_affinity fallback for non-SMP
Commit
3f017a4ca2de0a87767ab047b2bd2f3f11e87a9e
Parents
14186fea · 2ed9fd28

Merge commit. Changes below are compared with the first parent: 14186fea.

Changes

2 files changed · +13 −0

FileStatusAddDelContent
MAINTAINERSmodified+8−0View file
include/linux/interrupt.hmodified+5−0View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index c596b74..fa1b139 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4819,6 +4819,14 @@ L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
F: kernel/irq/
+
+IRQCHIP DRIVERS
+M: Thomas Gleixner <[email protected]>
+M: Jason Cooper <[email protected]>
+L: [email protected]
+S: Maintained
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
+T: git git://git.infradead.org/users/jcooper/linux.git irqchip/core
F: drivers/irqchip/
IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

include/linux/interrupt.h

View file
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 97ac926..051c850 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -272,6 +272,11 @@ static inline int irq_set_affinity(unsigned int irq, const struct cpumask *m)
return -EINVAL;
}
+static inline int irq_force_affinity(unsigned int irq, const struct cpumask *cpumask)
+{
+ return 0;
+}
+
static inline int irq_can_set_affinity(unsigned int irq)
{
return 0;