diff options
-rw-r--r-- | drivers/acpi/processor_idle.c | 4 | ||||
-rw-r--r-- | include/acpi/processor.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 9d1f01ee65db..eed3b458ebac 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -662,11 +662,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset) | |||
662 | 662 | ||
663 | seq_printf(seq, "active state: C%zd\n" | 663 | seq_printf(seq, "active state: C%zd\n" |
664 | "max_cstate: C%d\n" | 664 | "max_cstate: C%d\n" |
665 | "bus master activity: %08x\n" | ||
666 | "maximum allowed latency: %d usec\n", | 665 | "maximum allowed latency: %d usec\n", |
667 | pr->power.state ? pr->power.state - pr->power.states : 0, | 666 | pr->power.state ? pr->power.state - pr->power.states : 0, |
668 | max_cstate, (unsigned)pr->power.bm_activity, | 667 | max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); |
669 | pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); | ||
670 | 668 | ||
671 | seq_puts(seq, "states:\n"); | 669 | seq_puts(seq, "states:\n"); |
672 | 670 | ||
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index b09c4fde9725..4927c063347c 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -84,7 +84,6 @@ struct acpi_processor_power { | |||
84 | struct acpi_processor_cx *state; | 84 | struct acpi_processor_cx *state; |
85 | unsigned long bm_check_timestamp; | 85 | unsigned long bm_check_timestamp; |
86 | u32 default_state; | 86 | u32 default_state; |
87 | u32 bm_activity; | ||
88 | int count; | 87 | int count; |
89 | struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; | 88 | struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; |
90 | int timer_broadcast_on_state; | 89 | int timer_broadcast_on_state; |