From patchwork Thu Jun 24 14:40:41 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <jbeulich@novell.com>
X-Patchwork-Id: 107875
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 o5OEwQvm008431
	for <patchwork-acpi@patchwork.kernel.org>;
	Thu, 24 Jun 2010 15:00:25 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755803Ab0FXPAY (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Thu, 24 Jun 2010 11:00:24 -0400
Received: from vpn.id2.novell.com ([195.33.99.129]:36835 "EHLO
	vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755770Ab0FXPAY convert rfc822-to-8bit (ORCPT
	<rfc822;groupwise-JBeulich@novell.com:2:1>);
	Thu, 24 Jun 2010 11:00:24 -0400
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 24 Jun 2010 15:00:25 +0000 (UTC)
X-Greylist: delayed 1206 seconds by postgrey-1.27 at vger.kernel.org;
	Thu, 24 Jun 2010 11:00:23 EDT
Received: from EMEA1-MTA by vpn.id2.novell.com
	with Novell_GroupWise; Thu, 24 Jun 2010 17:56:59 +0100
Message-Id: <4C238A8902000078000080B1@vpn.id2.novell.com>
X-Mailer: Novell GroupWise Internet Agent 8.0.1 
Date: Thu, 24 Jun 2010 15:40:41 +0100
From: "Jan Beulich" <JBeulich@novell.com>
To: <len.brown@intel.com>
Cc: <linux-acpi@vger.kernel.org>
Subject: [PATCH] acpi/processor: fix for !CONFIG_CPU_IDLE
Mime-Version: 1.0
Content-Disposition: inline
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org


--- linux-2.6.35-rc3/drivers/acpi/processor_driver.c
+++ 2.6.35-rc3-acpi-no-cpuidle/drivers/acpi/processor_driver.c
@@ -922,6 +922,7 @@ static int __init acpi_processor_init(vo
 		return -ENOMEM;
 #endif
 
+#ifdef CONFIG_CPU_IDLE
 	if (!cpuidle_register_driver(&acpi_idle_driver)) {
 		printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
 			acpi_idle_driver.name);
@@ -929,6 +930,7 @@ static int __init acpi_processor_init(vo
 		printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",
 			cpuidle_get_driver()->name);
 	}
+#endif
 
 	result = acpi_bus_register_driver(&acpi_processor_driver);
 	if (result < 0)