diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-20 19:14:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-20 19:14:31 +0200 |
| commit | f05218651be1ac6a6088e226bd7350fb6c154414 (patch) | |
| tree | 204ee38c859f08e7e76ea4b6913cdea52cb25d56 /kernel/irq/irqdesc.c | |
| parent | 62a993df31f795d87bcb4c6cb005d36f32f6ad55 (diff) | |
| parent | a614a610ac9b28f195d790d25be72d26f345c53a (diff) | |
| download | linux-f05218651be1ac6a6088e226bd7350fb6c154414.tar.gz linux-f05218651be1ac6a6088e226bd7350fb6c154414.tar.bz2 linux-f05218651be1ac6a6088e226bd7350fb6c154414.zip | |
Merge branch 'irq/for-x86' into irq/core
Get the infrastructure patches which are required for x86/apic into core
Diffstat (limited to 'kernel/irq/irqdesc.c')
| -rw-r--r-- | kernel/irq/irqdesc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 73a76e2ee936..4afc457613dd 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -59,16 +59,10 @@ static void desc_smp_init(struct irq_desc *desc, int node) #endif } -static inline int desc_node(struct irq_desc *desc) -{ - return desc->irq_data.node; -} - #else static inline int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node) { return 0; } static inline void desc_smp_init(struct irq_desc *desc, int node) { } -static inline int desc_node(struct irq_desc *desc) { return 0; } #endif static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, @@ -76,6 +70,7 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, { int cpu; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data = NULL; @@ -299,7 +294,7 @@ static void free_desc(unsigned int irq) unsigned long flags; raw_spin_lock_irqsave(&desc->lock, flags); - desc_set_defaults(irq, desc, desc_node(desc), NULL); + desc_set_defaults(irq, desc, irq_desc_get_node(desc), NULL); raw_spin_unlock_irqrestore(&desc->lock, flags); } |