From patchwork Fri Apr 17 14:22:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 18674 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 n3HEKi7I024232 for ; Fri, 17 Apr 2009 14:22:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760463AbZDQOWS (ORCPT ); Fri, 17 Apr 2009 10:22:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759084AbZDQOWR (ORCPT ); Fri, 17 Apr 2009 10:22:17 -0400 Received: from cantor.suse.de ([195.135.220.2]:43591 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760463AbZDQOWO (ORCPT ); Fri, 17 Apr 2009 10:22:14 -0400 Received: from Relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 0890A93717; Fri, 17 Apr 2009 16:22:12 +0200 (CEST) From: Thomas Renninger To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, cpufreq@vger.kernel.org, venkatesh.pallipadi@intel.com, Thomas Renninger Subject: [PATCH 7/8] acpi-cpufreq: Use already defined IDA feature flag instead of checking cpuid Date: Fri, 17 Apr 2009 16:22:11 +0200 Message-Id: <1239978132-6261-8-git-send-email-trenn@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1239978132-6261-1-git-send-email-trenn@suse.de> References: <1239978132-6261-1-git-send-email-trenn@suse.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org It's already defined here: arch/x86/kernel/cpu/addon_cpuid_features.c: { X86_FEATURE_IDA, CR_EAX, 1, 0x00000006 }, Signed-off-by: Thomas Renninger Cc: Cc: "Pallipadi, Venkatesh" Cc: --- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index 148857a..aaf832f 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c @@ -60,7 +60,6 @@ enum { }; #define INTEL_MSR_RANGE (0xffff) -#define CPUID_6_ECX_APERFMPERF_CAPABILITY (0x1) struct acpi_cpufreq_data { struct acpi_processor_performance *acpi_data; @@ -645,12 +644,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) acpi_processor_notify_smm(THIS_MODULE); /* Check for APERF/MPERF support in hardware */ - if (c->x86_vendor == X86_VENDOR_INTEL && c->cpuid_level >= 6) { - unsigned int ecx; - ecx = cpuid_ecx(6); - if (ecx & CPUID_6_ECX_APERFMPERF_CAPABILITY) - acpi_cpufreq_driver.getavg = get_measured_perf; - } + if (cpu_has(¤t_cpu_data, X86_FEATURE_IDA)) + acpi_cpufreq_driver.getavg = get_measured_perf; + dprintk("CPU%u - ACPI performance management activated.\n", cpu); for (i = 0; i < perf->state_count; i++)