From 921fffc533d0e8d8efa807cc9e8201b059b24557 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 21 May 2010 19:40:02 -0400
Subject: [PATCH] --- yaml --- r: 199262 b: refs/heads/master c:
 34a18d6fe5430184e4ca96eeb074ee671d89fe7b h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/acpi/processor_idle.c | 16 +++-------------
 trunk/include/acpi/processor.h      | 13 -------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 671e0231ce3d..f4099f4cd3be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6bd535d88429b4804d6d917ab4f586306f9a855
+refs/heads/master: 34a18d6fe5430184e4ca96eeb074ee671d89fe7b
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index 5939e7f7d8e9..63a3d4b8c238 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -727,19 +727,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 			break;
 		}
 
-		if (pr->power.states[i].promotion.state)
-			seq_printf(seq, "promotion[C%zd] ",
-				   (pr->power.states[i].promotion.state -
-				    pr->power.states));
-		else
-			seq_puts(seq, "promotion[--] ");
-
-		if (pr->power.states[i].demotion.state)
-			seq_printf(seq, "demotion[C%zd] ",
-				   (pr->power.states[i].demotion.state -
-				    pr->power.states));
-		else
-			seq_puts(seq, "demotion[--] ");
+		seq_puts(seq, "promotion[--] ");
+
+		seq_puts(seq, "demotion[--] ");
 
 		seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",
 			   pr->power.states[i].latency,
diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h
index 86825ddbe14e..da565a48240e 100644
--- a/trunk/include/acpi/processor.h
+++ b/trunk/include/acpi/processor.h
@@ -52,17 +52,6 @@ struct acpi_power_register {
 	u64 address;
 } __attribute__ ((packed));
 
-struct acpi_processor_cx_policy {
-	u32 count;
-	struct acpi_processor_cx *state;
-	struct {
-		u32 time;
-		u32 ticks;
-		u32 count;
-		u32 bm;
-	} threshold;
-};
-
 struct acpi_processor_cx {
 	u8 valid;
 	u8 type;
@@ -74,8 +63,6 @@ struct acpi_processor_cx {
 	u32 power;
 	u32 usage;
 	u64 time;
-	struct acpi_processor_cx_policy promotion;
-	struct acpi_processor_cx_policy demotion;
 	char desc[ACPI_CX_DESC_LEN];
 };