From e2d1b6d93e03e5016acf3d45f65788a5f9bb9e33 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Thu, 14 Jun 2012 09:50:44 +0200 Subject: [PATCH] --- yaml --- r: 312429 b: refs/heads/master c: 5a0a2a308113086cc800a203d903271c9caa1611 h: refs/heads/master i: 312427: 255ef2c3526006f57e7ba9f38e949e20dcbfdd64 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/es7000_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 912b4771c5a2..845ba0cfc384 100644 --- 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 index 9882093f26e8..0874799a98c6 100644 --- 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)