From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>,
Anders Eriksson <aeriksson@fastmail.fm>,
Peter Anvin <hpa@zytor.com>, Ingo Molnar <mingo@elte.hu>,
Sergei Shtylyov <sshtylyov@ru.mvista.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] mtrr: fix UP breakage caused during switch to stop_machine
Date: Thu, 25 Aug 2011 19:46:56 +0200 [thread overview]
Message-ID: <20110825174656.GN2803@mtj.dyndns.org> (raw)
In-Reply-To: <CA+55aFwaxzFJCjJc1=6utMq0WQmrP4COGEOQirqBLcmdTf=+rQ@mail.gmail.com>
While removing custom rendezvous code and switching to stop_machine,
commit 192d8857427d "x86, mtrr: use stop_machine APIs for doing MTRR
rendezvous" completely dropped mtrr setting code on !CONFIG_SMP
breaking MTRR settting on UP. Fix it by removing the incorrect
CONFIG_SMP.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Anders Eriksson <aeriksson@fastmail.fm>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
---
arch/x86/kernel/cpu/mtrr/main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 08119a3..6b96110 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -149,7 +149,6 @@ struct set_mtrr_data {
*/
static int mtrr_rendezvous_handler(void *info)
{
-#ifdef CONFIG_SMP
struct set_mtrr_data *data = info;
/*
@@ -171,7 +170,6 @@ static int mtrr_rendezvous_handler(void *info)
} else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) {
mtrr_if->set_all();
}
-#endif
return 0;
}
next prev parent reply other threads:[~2011-08-25 17:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 7:03 mtrr failure, 3.1-rc1 Anders Eriksson
2011-08-25 15:55 ` Linus Torvalds
2011-08-25 16:46 ` Tejun Heo
2011-08-25 17:21 ` anders eriksson
2011-08-25 17:43 ` Suresh Siddha
2011-08-25 17:43 ` Linus Torvalds
2011-08-25 17:46 ` Tejun Heo [this message]
2011-08-25 18:00 ` [PATCH] mtrr: fix UP breakage caused during switch to stop_machine H. Peter Anvin
2011-08-25 18:03 ` Linus Torvalds
2011-08-25 19:47 ` mtrr failure, 3.1-rc1 anders eriksson
2011-08-25 22:10 ` Bob Tracy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110825174656.GN2803@mtj.dyndns.org \
--to=tj@kernel.org \
--cc=aeriksson@fastmail.fm \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sshtylyov@ru.mvista.com \
--cc=suresh.b.siddha@intel.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox