From patchwork Sat Jul 31 06:51:19 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yinghai Lu <yinghai@kernel.org>
X-Patchwork-Id: 116163
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6V6rQu4013455
	for <patchwork-acpi@patchwork.kernel.org>;
	Sat, 31 Jul 2010 06:53:26 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755423Ab0GaGxE (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Sat, 31 Jul 2010 02:53:04 -0400
Received: from rcsinet10.oracle.com ([148.87.113.121]:65528 "EHLO
	rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755151Ab0GaGxD (ORCPT
	<rfc822; linux-acpi@vger.kernel.org>); Sat, 31 Jul 2010 02:53:03 -0400
Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227])
	by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id
	o6V6pxPk009819
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Sat, 31 Jul 2010 06:52:01 GMT
Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154])
	by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id
	o6V6pwld026037; Sat, 31 Jul 2010 06:51:58 GMT
Received: from abhmt008.oracle.com by acsmt353.oracle.com
	with ESMTP id 472849541280559086; Fri, 30 Jul 2010 23:51:26 -0700
Received: from [192.168.101.11] (/75.55.220.242)
	by default (Oracle Beehive Gateway v4.0)
	with ESMTP ; Fri, 30 Jul 2010 23:51:26 -0700
Message-ID: <4C53C7E7.4040204@kernel.org>
Date: Fri, 30 Jul 2010 23:51:19 -0700
From: Yinghai Lu <yinghai@kernel.org>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6
MIME-Version: 1.0
To: Len Brown <lenb@kernel.org>, Suresh Siddha <suresh.b.siddha@intel.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	"H. Peter Anvin" <hpa@zytor.com>
CC: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ingo Molnar <mingo@elte.hu>
Subject: [PATCH] acpi: x2apic entry with uid < 255 could use processor
	statement
X-Source-IP: acsmt354.oracle.com [141.146.40.154]
X-Auth-Type: Internal IP
X-CT-RefId: str=0001.0A090206.4C53C80F.0205,ss=1,fgs=0
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sat, 31 Jul 2010 06:53:27 +0000 (UTC)


Index: linux-2.6/drivers/acpi/processor_core.c
===================================================================
--- linux-2.6.orig/drivers/acpi/processor_core.c
+++ linux-2.6/drivers/acpi/processor_core.c
@@ -69,7 +69,7 @@ static int map_x2apic_id(struct acpi_sub
 	if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
 		return 0;
 
-	if (device_declaration && (apic->uid == acpi_id)) {
+	if ((device_declaration || (acpi_id < 255)) && (apic->uid == acpi_id)) {
 		*apic_id = apic->local_apic_id;
 		return 1;
 	}