Commit 0a8c7fbf authored by Len Brown's avatar Len Brown

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.1

into intel.com:/home/lenb/src/linux-acpi-test-2.6.2
parents 659f7c1a 1e1b8dae
This diff is collapsed.
...@@ -203,9 +203,10 @@ acpi_ds_method_data_init_args ( ...@@ -203,9 +203,10 @@ acpi_ds_method_data_init_args (
while ((index < ACPI_METHOD_NUM_ARGS) && (index < max_param_count) && params[index]) { while ((index < ACPI_METHOD_NUM_ARGS) && (index < max_param_count) && params[index]) {
/* /*
* A valid parameter. * A valid parameter.
* Store the argument in the method/walk descriptor * Store the argument in the method/walk descriptor.
* Do not copy the arg in order to implement call by reference
*/ */
status = acpi_ds_store_object_to_local (AML_ARG_OP, index, params[index], status = acpi_ds_method_data_set_value (AML_ARG_OP, index, params[index],
walk_state); walk_state);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
......
This diff is collapsed.
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#define ACPI_PROCESSOR_MAX_C2_LATENCY 100 #define ACPI_PROCESSOR_MAX_C2_LATENCY 100
#define ACPI_PROCESSOR_MAX_C3_LATENCY 1000 #define ACPI_PROCESSOR_MAX_C3_LATENCY 1000
#define ACPI_PROCESSOR_MAX_PERFORMANCE 8
#define ACPI_PROCESSOR_MAX_THROTTLING 16 #define ACPI_PROCESSOR_MAX_THROTTLING 16
#define ACPI_PROCESSOR_MAX_THROTTLE 250 /* 25% */ #define ACPI_PROCESSOR_MAX_THROTTLE 250 /* 25% */
#define ACPI_PROCESSOR_MAX_DUTY_WIDTH 4 #define ACPI_PROCESSOR_MAX_DUTY_WIDTH 4
...@@ -67,20 +65,22 @@ struct acpi_processor_px { ...@@ -67,20 +65,22 @@ struct acpi_processor_px {
acpi_integer status; /* success indicator */ acpi_integer status; /* success indicator */
}; };
#define ACPI_PDC_REVISION_ID 0x1
struct acpi_processor_performance { struct acpi_processor_performance {
int state; unsigned int state;
int platform_limit; unsigned int platform_limit;
u16 control_register; struct acpi_pct_register control_register;
u16 status_register; struct acpi_pct_register status_register;
u8 control_register_bit_width; unsigned int state_count;
u8 status_register_bit_width; struct acpi_processor_px *states;
int state_count;
struct acpi_processor_px states[ACPI_PROCESSOR_MAX_PERFORMANCE]; /* the _PDC objects passed by the driver, if any */
struct cpufreq_frequency_table freq_table[ACPI_PROCESSOR_MAX_PERFORMANCE]; struct acpi_object_list *pdc;
struct acpi_processor *pr;
}; };
/* Throttling Control */ /* Throttling Control */
struct acpi_processor_tx { struct acpi_processor_tx {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment