diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 05:04:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 05:04:04 -0700 |
| commit | 107095a9463dc1c64168c7e6592d3a47c474fec8 (patch) | |
| tree | 082e23f980ba0fa44e19f4b071f72c589c26a8a7 /arch | |
| parent | e34eb39c1c791fe79da6aae0d9057f0c74c2f0ed (diff) | |
| parent | be604e695f9a0db4cd5c4c232857a10c6bc9dee4 (diff) | |
| download | linux-3.10-107095a9463dc1c64168c7e6592d3a47c474fec8.tar.gz linux-3.10-107095a9463dc1c64168c7e6592d3a47c474fec8.tar.bz2 linux-3.10-107095a9463dc1c64168c7e6592d3a47c474fec8.zip | |
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpu: Add cpufeature flag for PCIDs
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 88b23a43f34..aa6a488cd07 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -114,6 +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 */ |