From 6b4df2e8e61e6a28c458c1e6495f3ef9fa39dffd Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 25 Jul 2012 16:28:19 +0100 Subject: [PATCH] --- yaml --- r: 321338 b: refs/heads/master c: d6250a3f12edb3a86db9598ffeca3de8b4a219e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/alternative.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 21496e004762..4877dc8a2807 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a8ac745e3171889d364235b8203342e28526d2c +refs/heads/master: d6250a3f12edb3a86db9598ffeca3de8b4a219e9 diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c index 1f84794f0759..73ef56c5a8b3 100644 --- a/trunk/arch/x86/kernel/alternative.c +++ b/trunk/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;