Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpu: Add cpufeature flag for PCIDs

diff --combined arch/x86/include/asm/cpufeature.h
index 88b23a43f34037ac840e1e44acf6a29cb7dc5861,f24ed51c4b2d1400d3f7d66ea7358a36e24fff18..aa6a488cd075152abffb6f1b809fca7ad573c0ee
--- 1/arch/x86/include/asm/cpufeature.h
--- 2/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@@ -114,6 -114,7 +114,7 @@@
  #define X86_FEATURE_CX16      (4*32+13) /* CMPXCHG16B */
  #define X86_FEATURE_XTPR      (4*32+14) /* Send Task Priority Messages */
  #define X86_FEATURE_PDCM      (4*32+15) /* Performance Capabilities */
+ #define X86_FEATURE_PCID      (4*32+17) /* Process Context Identifiers */
  #define X86_FEATURE_DCA               (4*32+18) /* Direct Cache Access */
  #define X86_FEATURE_XMM4_1    (4*32+19) /* "sse4_1" SSE-4.1 */
  #define X86_FEATURE_XMM4_2    (4*32+20) /* "sse4_2" SSE-4.2 */
@@@ -332,6 -333,7 +333,6 @@@ static __always_inline __pure bool __st
                asm goto("1: jmp %l[t_no]\n"
                         "2:\n"
                         ".section .altinstructions,\"a\"\n"
 -                       _ASM_ALIGN "\n"
                         " .long 1b - .\n"
                         " .long 0\n"           /* no replacement */
                         " .word %P0\n"         /* feature bit */
@@@ -349,6 -351,7 +350,6 @@@
                asm volatile("1: movb $0,%0\n"
                             "2:\n"
                             ".section .altinstructions,\"a\"\n"
 -                           _ASM_ALIGN "\n"
                             " .long 1b - .\n"
                             " .long 3f - .\n"
                             " .word %P1\n"             /* feature bit */