---

yaml --- r: 312429 b: refs/heads/master c: 5a0a2a3 h: refs/heads/master i: 312427: 255ef2c v: v3
git-mirror · Jun 14, 2012 · e2d1b6d · e2d1b6d
1 parent 6d96903
commit e2d1b6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 214e270b5f5f6a85400a817d5305c797b2b7467a
+refs/heads/master: 5a0a2a308113086cc800a203d903271c9caa1611
diff --git a/trunk/arch/x86/kernel/apic/es7000_32.c b/trunk/arch/x86/kernel/apic/es7000_32.c
@@ -542,7 +542,7 @@ es7000_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
 
 			return -EINVAL;
 		}
-		apicid = new_apicid;
+		apicid |= new_apicid;
 		round++;
 	}
 	if (!round)