|
@@ -59,16 +59,10 @@ static void desc_smp_init(struct irq_desc *desc, int node)
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int desc_node(struct irq_desc *desc)
|
|
|
|
-{
|
|
|
|
- return desc->irq_data.node;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
#else
|
|
#else
|
|
static inline int
|
|
static inline int
|
|
alloc_masks(struct irq_desc *desc, gfp_t gfp, int node) { return 0; }
|
|
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 void desc_smp_init(struct irq_desc *desc, int node) { }
|
|
-static inline int desc_node(struct irq_desc *desc) { return 0; }
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,
|
|
static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,
|
|
@@ -300,7 +294,7 @@ static void free_desc(unsigned int irq)
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
|
|
raw_spin_lock_irqsave(&desc->lock, 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);
|
|
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
|
}
|
|
}
|
|
|
|
|