From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 23 Feb 2010 00:20:34 +0000 (-0800)
Subject: Merge branch 'x86/irq' into x86/apic
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d02e30c31c57683a66ed68a1bcff900ca78f6d56;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'x86/irq' into x86/apic

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

d02e30c31c57683a66ed68a1bcff900ca78f6d56
diff --cc arch/x86/kernel/apic/io_apic.c
index d55e43d352b3,527390cd6115..979589881c80
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@@ -3221,14 -3276,11 +3278,11 @@@ unsigned int create_irq_nr(unsigned in
  			irq = new;
  		break;
  	}
 -	spin_unlock_irqrestore(&vector_lock, flags);
 +	raw_spin_unlock_irqrestore(&vector_lock, flags);
  
- 	if (irq > 0) {
- 		dynamic_irq_init(irq);
- 		/* restore it, in case dynamic_irq_init clear it */
- 		if (desc_new)
- 			desc_new->chip_data = cfg_new;
- 	}
+ 	if (irq > 0)
+ 		dynamic_irq_init_keep_chip_data(irq);
+ 
  	return irq;
  }
  
@@@ -3250,20 -3302,13 +3304,13 @@@ 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);
 +	raw_spin_lock_irqsave(&vector_lock, flags);
- 	__clear_irq_vector(irq, cfg);
+ 	__clear_irq_vector(irq, get_irq_chip_data(irq));
 -	spin_unlock_irqrestore(&vector_lock, flags);
 +	raw_spin_unlock_irqrestore(&vector_lock, flags);
  }
  
  /*