summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/alternative.c
diff options
context:
space:
mode:
authorBorislav Petkov2013-03-20 15:07:23 +0100
committerH. Peter Anvin2013-04-02 19:12:52 +0200
commit65fc985b37dc241c4db7cd32adcbc989193fe3c8 (patch)
treeb530d4cb1b0a42ad8c220639aa7f9f970e8774df /arch/x86/kernel/alternative.c
parentLinux 3.9-rc5 (diff)
downloadkernel-qcow2-linux-65fc985b37dc241c4db7cd32adcbc989193fe3c8.tar.gz
kernel-qcow2-linux-65fc985b37dc241c4db7cd32adcbc989193fe3c8.tar.xz
kernel-qcow2-linux-65fc985b37dc241c4db7cd32adcbc989193fe3c8.zip
x86, cpu: Expand cpufeature facility to include cpu bugs
We add another 32-bit vector at the end of the ->x86_capability bitvector which collects bugs present in CPUs. After all, a CPU bug is a kind of a capability, albeit a strange one. Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1363788448-31325-2-git-send-email-bp@alien8.de Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/alternative.c')
-rw-r--r--arch/x86/kernel/alternative.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index ef5ccca79a6c..c15cf9a25e27 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -271,7 +271,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
replacement = (u8 *)&a->repl_offset + a->repl_offset;
BUG_ON(a->replacementlen > a->instrlen);
BUG_ON(a->instrlen > sizeof(insnbuf));
- BUG_ON(a->cpuid >= NCAPINTS*32);
+ BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
if (!boot_cpu_has(a->cpuid))
continue;