---

yaml
---
r: 113335
b: refs/heads/master
c: 5b792d3
h: refs/heads/master
i:
  113333: c5d56c4
  113331: f315b1f
  113327: a66d722
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d45de40934897c6ee5b05141f7895bbb28512395
+refs/heads/master: 5b792d320f28ff83dd4c13f984807e26235f7703

trunk/arch/x86/kernel/microcode_amd.c

@@ -206,6 +206,7 @@ static void apply_microcode_amd(int cpu)
 	unsigned int rev;
 	int cpu_num = raw_smp_processor_id();
 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
+	unsigned long addr;
 
 	/* We should bind the task to the CPU */
 	BUG_ON(cpu_num != cpu);
@@ -215,10 +216,9 @@ static void apply_microcode_amd(int cpu)
 
 	spin_lock_irqsave(&microcode_update_lock, flags);
 
-	edx = (unsigned int)(((unsigned long)
-			      &(uci->mc.mc_amd->hdr.data_code)) >> 32);
-	eax = (unsigned int)(((unsigned long)
-			      &(uci->mc.mc_amd->hdr.data_code)) & 0xffffffffL);
+	addr = (unsigned long)&uci->mc.mc_amd->hdr.data_code;
+	edx = (unsigned int)(((unsigned long)upper_32_bits(addr)));
+	eax = (unsigned int)(((unsigned long)lower_32_bits(addr)));
 
 	asm volatile("movl %0, %%ecx; wrmsr" :
 		     : "i" (0xc0010020), "a" (eax), "d" (edx) : "ecx");