[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-lww2uirad4skzjlmrm0vru8o@git.kernel.org>
Date: Wed, 25 Jul 2012 09:18:53 -0700
From: tip-bot for Alan Cox <alan@...ux.intel.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, alan@...ux.intel.com, hpa@...or.com,
mingo@...nel.org, stable@...r.kernel.org, tglx@...utronix.de
Subject: [tip:x86/urgent] x86, nops:
Missing break resulting in incorrect selection on Intel
Commit-ID: d6250a3f12edb3a86db9598ffeca3de8b4a219e9
Gitweb: http://git.kernel.org/tip/d6250a3f12edb3a86db9598ffeca3de8b4a219e9
Author: Alan Cox <alan@...ux.intel.com>
AuthorDate: Wed, 25 Jul 2012 16:28:19 +0100
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Wed, 25 Jul 2012 08:35:38 -0700
x86, nops: Missing break resulting in incorrect selection on Intel
The Intel case falls through into the generic case which then changes
the values. For cases like the P6 it doesn't do the right thing so
this seems to be a screwup.
Signed-off-by: Alan Cox <alan@...ux.intel.com>
Link: http://lkml.kernel.org/n/tip-lww2uirad4skzjlmrm0vru8o@git.kernel.org
Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: <stable@...r.kernel.org>
---
arch/x86/kernel/alternative.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 1f84794..73ef56c 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -219,7 +219,7 @@ void __init arch_init_ideal_nops(void)
ideal_nops = intel_nops;
#endif
}
-
+ break;
default:
#ifdef CONFIG_X86_64
ideal_nops = k8_nops;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists