Messages in this thread | | | Date | Fri, 05 Feb 2010 23:16:12 -0800 | From | Yinghai Lu <> | Subject | Re: [PATCH v3] x86: keep chip_data in create_irq_nr and destroy_irq |
| |
On 02/05/2010 10:42 PM, Brandon Philips wrote: > Version 3: Forgot to refresh patch so destroy_irq() had uninitialized > cfg as param to __clear_irq_vector(). Fixed now.
> @@ -3255,19 +3252,15 @@ int create_irq(void) > void destroy_irq(unsigned int irq) > { > unsigned long flags; > - struct irq_cfg *cfg; > struct irq_desc *desc; > > /* store it, in case dynamic_irq_cleanup clear it */ > desc = irq_to_desc(irq); > - cfg = desc->chip_data; > - dynamic_irq_cleanup(irq); > - /* connect back irq_cfg */ > - desc->chip_data = cfg; > + dynamic_irq_cleanup_keep_chip_data(irq); > > free_irte(irq); > spin_lock_irqsave(&vector_lock, flags); > - __clear_irq_vector(irq, cfg); > + __clear_irq_vector(irq, desc->chip_data); > spin_unlock_irqrestore(&vector_lock, flags); > }
==> @@ -3308,17 +3305,12 @@ void destroy_irq(unsigned int irq) { unsigned long flags; struct irq_cfg *cfg; - struct irq_desc *desc; - /* store it, in case dynamic_irq_cleanup clear it */ - desc = irq_to_desc(irq); - cfg = desc->chip_data; - dynamic_irq_cleanup(irq); - /* connect back irq_cfg */ - desc->chip_data = cfg; + dynamic_irq_cleanup_keep_chip_data(irq); free_irte(irq); spin_lock_irqsave(&vector_lock, flags); + cfg = irq_to_desc(irq)->chip_data; __clear_irq_vector(irq, cfg); spin_unlock_irqrestore(&vector_lock, flags); }
Yinghai
| |