From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 7 Jun 2015 13:35:27 +0000 (+0200)
Subject: Merge branch 'x86/ras' into x86/core, to fix conflicts
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'x86/ras' into x86/core, to fix conflicts

Conflicts:
	arch/x86/include/asm/irq_vectors.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080
diff --cc arch/x86/include/asm/irq_vectors.h
index 0ed29ac13a9d,8900ba444ad7..4c2d2eb2060a
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@@ -83,12 -102,6 +83,7 @@@
   */
  #define X86_PLATFORM_IPI_VECTOR		0xf7
  
- /* Vector for KVM to deliver posted interrupt IPI */
- #ifdef CONFIG_HAVE_KVM
- #define POSTED_INTR_VECTOR		0xf2
 +#define POSTED_INTR_WAKEUP_VECTOR	0xf1
- #endif
- 
  /*
   * IRQ work vector:
   */