The patch titled
Display Intel Dynamic Acceleration feature in /proc/cpuinfo
has been removed from the -mm tree. Its filename was
display-intel-dynamic-acceleration-feature-in-proc-cpuinfo.patch
This patch was dropped because of patch conflicts
------------------------------------------------------
Subject: Display Intel Dynamic Acceleration feature in /proc/cpuinfo
From: Venki Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Display Intel Dynamic Acceleration feature in /proc/cpuinfo. This feature
will be enabled automatically by current acpi-cpufreq driver and cpufreq.
Refer to Intel Software Developer's Manual for more details about the feature.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Cc: Len Brown <len.brown@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 13 ++++++++++++-
asm-x86_64/cpufeature.h | 0
2 files changed, 12 insertions(+), 1 deletion(-)
diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~display-intel-dynamic-acceleration-feature-in-proc-cpuinfo arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~display-intel-dynamic-acceleration-feature-in-proc-cpuinfo
+++ a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -58,6 +58,7 @@ enum {
#define INTEL_MSR_RANGE (0xffff)
#define CPUID_6_ECX_APERFMPERF_CAPABILITY (0x1)
+#define CPUID_6_EAX_IDA_CAPABILITY (0x2)
struct acpi_cpufreq_data {
struct acpi_processor_performance *acpi_data;
@@ -702,10 +703,20 @@ static int acpi_cpufreq_cpu_init(struct
/* Check for APERF/MPERF support in hardware */
if (c->x86_vendor == X86_VENDOR_INTEL && c->cpuid_level >= 6) {
- unsigned int ecx;
+ unsigned int eax, ecx;
ecx = cpuid_ecx(6);
if (ecx & CPUID_6_ECX_APERFMPERF_CAPABILITY)
acpi_cpufreq_driver.getavg = get_measured_perf;
+
+ eax = cpuid_eax(6);
+ if (eax & CPUID_6_EAX_IDA_CAPABILITY) {
+ unsigned int i;
+
+ for_each_cpu_mask(i, policy->cpus) {
+ struct cpuinfo_x86 *c = &cpu_data[i];
+ set_bit(X86_FEATURE_IDA, c->x86_capability);
+ }
+ }
}
dprintk("CPU%u - ACPI performance management activated.\n", cpu);
diff -puN arch/i386/kernel/cpu/proc.c~display-intel-dynamic-acceleration-feature-in-proc-cpuinfo arch/i386/kernel/cpu/proc.c
diff -puN arch/x86_64/kernel/setup.c~display-intel-dynamic-acceleration-feature-in-proc-cpuinfo arch/x86_64/kernel/setup.c
diff -puN include/asm-i386/cpufeature.h~display-intel-dynamic-acceleration-feature-in-proc-cpuinfo include/asm-i386/cpufeature.h
diff -puN include/asm-x86_64/cpufeature.h~display-intel-dynamic-acceleration-feature-in-proc-cpuinfo include/asm-x86_64/cpufeature.h
_
Patches currently in -mm which might be from venkatesh.pallipadi@xxxxxxxxx are
display-intel-dynamic-acceleration-feature-in-proc-cpuinfo.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
