Merge commit 'v2.6.27-rc1' into x86/microcode

Conflicts:

	arch/x86/kernel/microcode.c

Manual resolutions:

	arch/x86/kernel/microcode_amd.c
	arch/x86/kernel/microcode_intel.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index fd9e68e88899..07e52beacb44 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -445,7 +445,6 @@ static int apply_microcode_check_cpu_amd(int cpu)
         struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
         unsigned int rev;
         cpumask_t old;
-        cpumask_of_cpu_ptr(newmask, cpu);
         int err = 0;
 
         /* Check if the microcode is available */
@@ -453,7 +452,7 @@ static int apply_microcode_check_cpu_amd(int cpu)
                 return 0;
 
         old = current->cpus_allowed;
-        set_cpus_allowed(current, newmask);
+        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
 
         /* Check if the microcode we have in memory matches the CPU */
         if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 16)