From patchwork Wed Jun 24 03:46:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 32079 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5O3jfr4017900 for ; Wed, 24 Jun 2009 03:45:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751881AbZFXDph (ORCPT ); Tue, 23 Jun 2009 23:45:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752534AbZFXDph (ORCPT ); Tue, 23 Jun 2009 23:45:37 -0400 Received: from mga09.intel.com ([134.134.136.24]:50552 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751881AbZFXDpg (ORCPT ); Tue, 23 Jun 2009 23:45:36 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 23 Jun 2009 20:33:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,279,1243839600"; d="scan'208";a="527291092" Received: from yakui_zhao.sh.intel.com (HELO [10.239.13.177]) ([10.239.13.177]) by orsmga001.jf.intel.com with ESMTP; 23 Jun 2009 20:45:27 -0700 Subject: [PATCH]: ACPI: Rename ACPI processor device bus ID From: yakui_zhao To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org Organization: Intel Open Source Technology Center Date: Wed, 24 Jun 2009 11:46:44 +0800 Message-Id: <1245815204.7266.21.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Zhao Yakui ------------[ cut here ]------------ WARNING: at fs/proc/generic.c:590 proc_register+0x148/0x180() Hardware name: Sunrise Ridge proc_dir_entry 'processor/CPU0' already registered Modules linked in: processor(+) thermal_sys hwmon Pid: 255, comm: modprobe Tainted: G W 2.6.30-rc3MASHLEY #1 Call Trace: [] warn_slowpath+0xb1/0xe5 [] ? ida_get_new_above+0x190/0x1b1 [] ? idr_pre_get+0x5f/0x75 [] proc_register+0x148/0x180 [] proc_mkdir_mode+0x3d/0x52 [] proc_mkdir+0x11/0x13 [] acpi_processor_start+0x755/0x9bc [processor] Rename the processor device bus id. And the new bus id will be generated as the following format: CPU+ CPU ID For example: If the cpu ID is 5, then the bus ID will be "CPU5". If the CPU ID is 10, then the bus ID will be "CPUA". http://bugzilla.kernel.org/show_bug.cgi?id=13612 Signed-off-by: Zhao Yakui --- drivers/acpi/processor_core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/acpi/processor_core.c =================================================================== --- linux-2.6.orig/drivers/acpi/processor_core.c 2009-06-24 11:24:53.000000000 +0800 +++ linux-2.6/drivers/acpi/processor_core.c 2009-06-24 11:25:06.000000000 +0800 @@ -649,7 +649,16 @@ return -ENODEV; } } - + /* + * On some boxes several processors use the same processor bus id. + * But they are located in different scope. For example: + * \_SB.SCK0.CPU0 + * \_SB.SCK1.CPU0 + * Rename the processor device bus id. And the new bus id will be + * generated as the following format: + * CPU+CPU ID. + */ + sprintf(acpi_device_bid(device), "CPU%X", pr->id); ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d:%d]\n", pr->id, pr->acpi_id));