---

yaml --- r: 328671 b: refs/heads/master c: c59687f h: refs/heads/master i: 328669: 7070a21 328667: 1d7e695 328663: 22cd4b9 328655: 8ccc494 328639: 9c0cee6 v: v3
git-mirror · Sep 5, 2012 · 7f48c55 · 7f48c55
1 parent e3a373d
commit 7f48c55
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66804c13f7b79fb26cf4848ebac1e865b9aff65c
+refs/heads/master: c59687f8466df36633d937cc298aad465d704990
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
@@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 		if (obj->type != ACPI_TYPE_INTEGER)
 			continue;
 
-		cx.power = obj->integer.value;
-
 		current_count++;
 		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
 

diff --git a/trunk/drivers/xen/xen-acpi-processor.c b/trunk/drivers/xen/xen-acpi-processor.c
@@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
 
 		dst_cx->type = cx->type;
 		dst_cx->latency = cx->latency;
-		dst_cx->power = cx->power;
 
 		dst_cx->dpcnt = 0;
 		set_xen_guest_handle(dst_cx->dp, NULL);

diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h
@@ -59,7 +59,6 @@ struct acpi_processor_cx {
 	u8 entry_method;
 	u8 index;
 	u32 latency;
-	u32 power;
 	u8 bm_sts_skip;
 	char desc[ACPI_CX_DESC_LEN];
 };