From d434946165b4d9ba09c69768bb193b03a0250e68 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Tue, 13 Feb 2007 13:26:23 +0100 Subject: [PATCH] --- yaml --- r: 48447 b: refs/heads/master c: ad4e680fb2220518de5118a8e734240d4c374fe2 h: refs/heads/master i: 48445: 8dd8179af5357543e93b2d4a7c4ba08a03946f4d 48443: 2dbadb288dd9c15b2e6e8fff18dfc6f08cf7cd96 48439: 2dfd6f40f35df280f536c730dc0f7ea69f3932c4 48431: 08baab8164dc6b484c83fe1e738b119f9a10861e 48415: 2ff9991cf8de4e7b06fe19f5751e1770bec381ea 48383: d4416ff7482193756914f0c6f95947846c8c058f v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpuid.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 979e6c3f279e..19dc17209041 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d958f143329e685d114725b64fe6bef22994c74c +refs/heads/master: ad4e680fb2220518de5118a8e734240d4c374fe2 diff --git a/trunk/arch/i386/kernel/cpuid.c b/trunk/arch/i386/kernel/cpuid.c index 4da75fa3208d..eeae0d992337 100644 --- a/trunk/arch/i386/kernel/cpuid.c +++ b/trunk/arch/i386/kernel/cpuid.c @@ -48,7 +48,6 @@ static struct class *cpuid_class; #ifdef CONFIG_SMP struct cpuid_command { - int cpu; u32 reg; u32 *data; }; @@ -57,8 +56,7 @@ static void cpuid_smp_cpuid(void *cmd_block) { struct cpuid_command *cmd = (struct cpuid_command *)cmd_block; - if (cmd->cpu == smp_processor_id()) - cpuid(cmd->reg, &cmd->data[0], &cmd->data[1], &cmd->data[2], + cpuid(cmd->reg, &cmd->data[0], &cmd->data[1], &cmd->data[2], &cmd->data[3]); } @@ -70,11 +68,10 @@ static inline void do_cpuid(int cpu, u32 reg, u32 * data) if (cpu == smp_processor_id()) { cpuid(reg, &data[0], &data[1], &data[2], &data[3]); } else { - cmd.cpu = cpu; cmd.reg = reg; cmd.data = data; - smp_call_function(cpuid_smp_cpuid, &cmd, 1, 1); + smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1, 1); } preempt_enable(); }