From 7b20ee98afb633857d7794237a8266a6855e8a19 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Tue, 13 Jul 2010 14:57:50 -0700
Subject: [PATCH] --- yaml --- r: 206175 b: refs/heads/master c:
 3b770a2128423a687e6e9c57184a584fb4ba4c77 h: refs/heads/master i:   206173:
 682e60a79473ae0f299f9e402e0b471223fb3a8d   206171:
 d990532656b970fbeeed08bdf127d403424d8235   206167:
 91a9b600554e2ca4f7086c111c9a3c6fa83ca764   206159:
 7084c9691bb273742239f60923839eedbf3b57af   206143:
 765b1db8f8dce2bdfe58d64474c947b51a81d4a9 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/alternative.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dd6dd16e93bb..a5c06aa9c597 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df378ccfc4dd04e263426ad805516915874774aa
+refs/heads/master: 3b770a2128423a687e6e9c57184a584fb4ba4c77
diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c
index 70237732a6c7..f65ab8b014c4 100644
--- a/trunk/arch/x86/kernel/alternative.c
+++ b/trunk/arch/x86/kernel/alternative.c
@@ -214,6 +214,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
 		u8 *instr = a->instr;
 		BUG_ON(a->replacementlen > a->instrlen);
 		BUG_ON(a->instrlen > sizeof(insnbuf));
+		BUG_ON(a->cpuid >= NCAPINTS*32);
 		if (!boot_cpu_has(a->cpuid))
 			continue;
 #ifdef CONFIG_X86_64