On 05/05/15 03:46, Hanjun Guo wrote:
Just use pr->id instead of cpu_index to simplify the code.
IIRC pr->id is u32, has it changed in any other patches that's not in mainline ? Otherwise, comparing it with -1 makes no sense here.
Regards, Sudeep
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/acpi_processor.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 58f335c..d6ac918 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -216,7 +216,7 @@ static int acpi_processor_get_info(struct acpi_device *device) struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; struct acpi_processor *pr = acpi_driver_data(device); phys_cpuid_t phys_id;
- int cpu_index, device_declaration = 0;
- int device_declaration = 0; acpi_status status = AE_OK; static int cpu0_initialized; unsigned long long value;
@@ -268,17 +268,16 @@ static int acpi_processor_get_info(struct acpi_device *device) acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n"); pr->phys_id = phys_id;
- cpu_index = acpi_map_cpuid(pr->phys_id, pr->acpi_id);
- pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id); if (!cpu0_initialized && !acpi_has_cpu_in_madt()) { cpu0_initialized = 1; /*
*/
- Handle UP system running SMP kernel, with no CPU
- entry in MADT
if ((cpu_index == -1) && (num_online_cpus() == 1))cpu_index = 0;
if ((pr->id == -1) && (num_online_cpus() == 1))pr->id = 0;
pr->id = cpu_index;
/*
- Extra Processor objects may be enumerated on MP systems with