From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 23 Dec 2008 15:24:15 +0000 (+0100)
Subject: Merge branch 'x86/apic' into x86/irq
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf8bd66d0580f296f257d371ee41a0a137b541c7;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'x86/apic' into x86/irq

Conflicts:
	arch/x86/kernel/apic.c
---

bf8bd66d0580f296f257d371ee41a0a137b541c7
diff --cc arch/x86/kernel/apic.c
index 1771dd74681,fc26ff390f1..47cbaa237b7
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@@ -1691,11 -1681,14 +1677,11 @@@ void smp_spurious_interrupt(struct pt_r
  	if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
  		ack_APIC_irq();
  
 -#ifdef CONFIG_X86_64
 -	add_pda(irq_spurious_count, 1);
 -#else
 +	inc_irq_stat(irq_spurious_count);
 +
  	/* see sw-dev-man vol 3, chapter 7.4.13.5 */
- 	printk(KERN_INFO "spurious APIC interrupt on CPU#%d, "
- 	       "should never happen.\n", smp_processor_id());
+ 	pr_info("spurious APIC interrupt on CPU#%d, "
+ 		"should never happen.\n", smp_processor_id());
 -	__get_cpu_var(irq_stat).irq_spurious_count++;
 -#endif
  	irq_exit();
  }