diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2016-03-10 23:12:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-11 09:55:57 +0100 |
| commit | 0d47638f80a02b15869f1fe1fc09e5bf996750fd (patch) | |
| tree | b9b2f2fdb837c4c58104906bf5a32f129cf377dd /mm/nommu.c | |
| parent | mm/pkeys: Fix siginfo ABI breakage caused by new u64 field (diff) | |
| download | linux-0d47638f80a02b15869f1fe1fc09e5bf996750fd.tar.xz linux-0d47638f80a02b15869f1fe1fc09e5bf996750fd.zip | |
x86/mm/pkeys: Fix mismerge of protection keys CPUID bits
Kirill Shutemov pointed this out to me.
The tip tree currently has commit:
dfb4a70f2 [x86/cpufeature, x86/mm/pkeys: Add protection keys related CPUID definitions]
whioch added support for two new CPUID bits: X86_FEATURE_PKU and
X86_FEATURE_OSPKE. But, those bits were mis-merged and put in
cpufeature.h instead of cpufeatures.h.
This didn't cause any breakage *except* it keeps the "ospke" and
"pku" bits from showing up in cpuinfo.
Now cpuinfo has the two new flags:
flags : ... pku ospke
BTW, is it really wise to have cpufeature.h and cpufeatures.h?
It seems like they can only cause confusion and mahem with tab
completion.
Reported-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave@sr71.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160310221213.06F9DB53@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/nommu.c')
0 files changed, 0 insertions, 0 deletions