Merge branch 'x86/fpu' into x86/smap
[linux-3.10.git] / arch / x86 / include / asm / cpufeature.h
index 0debdb5..16cae42 100644 (file)
 #define X86_FEATURE_RTM                (9*32+11) /* Restricted Transactional Memory */
 #define X86_FEATURE_RDSEED     (9*32+18) /* The RDSEED instruction */
 #define X86_FEATURE_ADX                (9*32+19) /* The ADCX and ADOX instructions */
+#define X86_FEATURE_SMAP       (9*32+20) /* Supervisor Mode Access Prevention */
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)