From patchwork Sun Jan 20 10:24:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 2008041 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 231313FDD1 for ; Sun, 20 Jan 2013 10:25:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751937Ab3ATKYm (ORCPT ); Sun, 20 Jan 2013 05:24:42 -0500 Received: from mail.skyhub.de ([78.46.96.112]:41419 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751610Ab3ATKYj (ORCPT ); Sun, 20 Jan 2013 05:24:39 -0500 X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1358677478; bh=BuvNMQ0hbDPqfNzBhgAnxJlcjrJ3wlEDn7ixP4KjIJ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=EXq/ vUFiF4kMB8ZLX7grCgLFxH+Y2munAqZ3lEnWKpnyhPzIhMvFA7w4C/Py5bVBCgTlZES zI8eU8t5U5SNrJXyVMYsBEHIGD5aNpczUueJt8Ot6zhlluhZYrxwj4sXrFLDxP6Wtph zecTxmAEisDJ/USTzSl1WqlC37AGbA0lA= Received: from mail.skyhub.de ([127.0.0.1]) by localhost (door.skyhub.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Nf05uraLsVHp; Sun, 20 Jan 2013 11:24:38 +0100 (CET) Received: from liondog.tnic (p4FF1D70B.dip.t-dialin.net [79.241.215.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 361251D9DFA; Sun, 20 Jan 2013 11:24:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1358677477; bh=BuvNMQ0hbDPqfNzBhgAnxJlcjrJ3wlEDn7ixP4KjIJ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=J5G3 A8sXMSmbxNA0cVumHSRaXS7FbE1wq2nhJHKaaKkzp7GM8CfuU59oFhRzVflY8ISY6FL udKKSR4HkGjlCD3FvyicX3m3FO+EEbb3O9SpeexmcSofh+LTqveDebc1T/60RRLi6OI qZ6aRgOVThKjLK82wZyPrus38CGSaZwVA= Received: by liondog.tnic (Postfix, from userid 1000) id C27D210167F; Sun, 20 Jan 2013 11:24:36 +0100 (CET) From: Borislav Petkov To: "Rafael J. Wysocki" Cc: =?UTF-8?q?Andr=C3=A9=20Przywara?= , Leonid Isaev , Tom Gundersen , cpufreq@vger.kernel.org, linux-acpi@vger.kernel.org, LKML , Borislav Petkov Subject: [PATCH 3/6] cpufreq: Make acpi-cpufreq link first Date: Sun, 20 Jan 2013 11:24:27 +0100 Message-Id: <1358677470-17394-4-git-send-email-bp@alien8.de> X-Mailer: git-send-email 1.8.1.rc3 In-Reply-To: <1358677470-17394-1-git-send-email-bp@alien8.de> References: <1358677470-17394-1-git-send-email-bp@alien8.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Borislav Petkov Now that the majority of x86 CPUs out there are supported by acpi-cpufreq, we want it to load first and, in the AMD case, drop to powernow-k8 only on K8s. If, however, both powernow-k8 and acpi-cpufreq are built-in, the link order matters. Correct that. Signed-off-by: Borislav Petkov --- drivers/cpufreq/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index fadc4d496e2f..24d4a63fd6cf 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -19,11 +19,12 @@ obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o ################################################################################## # x86 drivers. # Link order matters. K8 is preferred to ACPI because of firmware bugs in early -# K8 systems. ACPI is preferred to all other hardware-specific drivers. +# K8 systems. This is still the case but acpi-cpufreq errors out so that +# powernow-k8 can load then. ACPI is preferred to all other hardware-specific drivers. # speedstep-* is preferred over p4-clockmod. -obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o mperf.o +obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o obj-$(CONFIG_X86_POWERNOW_K7) += powernow-k7.o