From 0d5a167fcc6939a837f4176c2d7d2da3b2947618 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Wed, 22 Apr 2009 19:28:15 -0400 Subject: [PATCH] --- yaml --- r: 144103 b: refs/heads/master c: 92614610774072ea68131f16e024ee8fc15be9be h: refs/heads/master i: 144101: 90c4ff23639282d1fa0f5cd8ac220ff581b670f5 144099: 1c9edc990ac2c0478f6d6d0a10d87d98ea1943c1 144095: f70baadc4783088d4f50aa2a835de8f62c238df5 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_idle.c | 4 +--- trunk/include/acpi/processor.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 48c50da97abf..4e9effc3bb03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a71e4917dc0ebbcb5a0ecb7ca3486643c1c9a6e2 +refs/heads/master: 92614610774072ea68131f16e024ee8fc15be9be diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c index 9d1f01ee65db..eed3b458ebac 100644 --- a/trunk/drivers/acpi/processor_idle.c +++ b/trunk/drivers/acpi/processor_idle.c @@ -662,11 +662,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset) seq_printf(seq, "active state: C%zd\n" "max_cstate: C%d\n" - "bus master activity: %08x\n" "maximum allowed latency: %d usec\n", pr->power.state ? pr->power.state - pr->power.states : 0, - max_cstate, (unsigned)pr->power.bm_activity, - pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); + max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); seq_puts(seq, "states:\n"); diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h index b09c4fde9725..4927c063347c 100644 --- a/trunk/include/acpi/processor.h +++ b/trunk/include/acpi/processor.h @@ -84,7 +84,6 @@ struct acpi_processor_power { struct acpi_processor_cx *state; unsigned long bm_check_timestamp; u32 default_state; - u32 bm_activity; int count; struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; int timer_broadcast_on_state;