[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20070921204527.AB6B814EFF@wotan.suse.de>
Date: Fri, 21 Sep 2007 22:45:27 +0200 (CEST)
From: Andi Kleen <ak@...e.de>
To: avi@...ranet.com, hpa@...or.com, ak@...e.de, patches@...-64.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] [44/45] i386: simplify smp_call_function_single() call sequence in cpuid
From: Avi Kivity <avi@...ranet.com>
smp_call_function_single() now knows how to call the function on the
current cpu.
Cc: H. Peter Anvin <hpa@...or.com>
Signed-off-by: Avi Kivity <avi@...ranet.com>
Signed-off-by: Andi Kleen <ak@...e.de>
Cc: Andi Kleen <ak@...e.de>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
arch/i386/kernel/cpuid.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
Index: linux/arch/i386/kernel/cpuid.c
===================================================================
--- linux.orig/arch/i386/kernel/cpuid.c
+++ linux/arch/i386/kernel/cpuid.c
@@ -45,8 +45,6 @@
static struct class *cpuid_class;
-#ifdef CONFIG_SMP
-
struct cpuid_command {
u32 reg;
u32 *data;
@@ -64,25 +62,11 @@ static inline void do_cpuid(int cpu, u32
{
struct cpuid_command cmd;
- preempt_disable();
- if (cpu == smp_processor_id()) {
- cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
- } else {
- cmd.reg = reg;
- cmd.data = data;
+ cmd.reg = reg;
+ cmd.data = data;
- smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1, 1);
- }
- preempt_enable();
+ smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1, 1);
}
-#else /* ! CONFIG_SMP */
-
-static inline void do_cpuid(int cpu, u32 reg, u32 * data)
-{
- cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
-}
-
-#endif /* ! CONFIG_SMP */
static loff_t cpuid_seek(struct file *file, loff_t offset, int orig)
{
-
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