diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /include/acpi | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
| download | kernel_samsung_tuna-b2576e1d4408e134e2188c967b1f28af39cd79d4.zip kernel_samsung_tuna-b2576e1d4408e134e2188c967b1f28af39cd79d4.tar.gz kernel_samsung_tuna-b2576e1d4408e134e2188c967b1f28af39cd79d4.tar.bz2 | |
Merge branch 'linus' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/actypes.h | 2 | ||||
| -rw-r--r-- | include/acpi/processor.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 03744d2..a20aab5 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -604,7 +604,7 @@ typedef u32 acpi_object_type; /* * These are special object types that never appear in - * a Namespace node, only in an union acpi_operand_object + * a Namespace node, only in a union acpi_operand_object */ #define ACPI_TYPE_LOCAL_EXTRA 0x1C #define ACPI_TYPE_LOCAL_DATA 0x1D diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 3795590..0574add 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); |