Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
	include/linux/kernel_stat.h

1 files changed, 2 insertions, 2 deletions

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 3795590e152a..0574add2a1e3 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -127,7 +127,7 @@ struct acpi_processor_performance {
         unsigned int state_count;
         struct acpi_processor_px *states;
         struct acpi_psd_package domain_info;
-        cpumask_t shared_cpu_map;
+        cpumask_var_t shared_cpu_map;
         unsigned int shared_type;
 };
 
@@ -172,7 +172,7 @@ struct acpi_processor_throttling {
         unsigned int state_count;
         struct acpi_processor_tx_tss *states_tss;
         struct acpi_tsd_package domain_info;
-        cpumask_t shared_cpu_map;
+        cpumask_var_t shared_cpu_map;
         int (*acpi_processor_get_throttling) (struct acpi_processor * pr);
         int (*acpi_processor_set_throttling) (struct acpi_processor * pr,
                                               int state);