Pull bugzilla-5452 into release branch

diff --combined drivers/acpi/processor_core.c
index e5041c4,18d380f..a1b46fb
--- 1/drivers/acpi/processor_core.c
--- 2/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@@ -388,7 -388,7 +388,7 @@@ static int acpi_processor_remove_fs(str
  
  /* Use the acpiid in MADT to map cpus in case of SMP */
  #ifndef CONFIG_SMP
 -#define convert_acpiid_to_cpu(acpi_id) (0xff)
 +#define convert_acpiid_to_cpu(acpi_id) (-1)
  #else
  
  #ifdef CONFIG_IA64
@@@ -401,7 -401,7 +401,7 @@@
  #define ARCH_BAD_APICID               (0xff)
  #endif
  
 -static u8 convert_acpiid_to_cpu(u8 acpi_id)
 +static int convert_acpiid_to_cpu(u8 acpi_id)
  {
        u16 apic_id;
        int i;
@@@ -427,7 -427,7 +427,7 @@@ static int acpi_processor_get_info(stru
        acpi_status status = 0;
        union acpi_object object = { 0 };
        struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
 -      u8 cpu_index;
 +      int cpu_index;
        static int cpu0_initialized;
  
        ACPI_FUNCTION_TRACE("acpi_processor_get_info");
@@@ -473,7 -473,7 +473,7 @@@
        cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
  
        /* Handle UP system running SMP kernel, with no LAPIC in MADT */
 -      if (!cpu0_initialized && (cpu_index == 0xff) &&
 +      if (!cpu0_initialized && (cpu_index == -1) &&
            (num_online_cpus() == 1)) {
                cpu_index = 0;
        }
@@@ -487,7 -487,7 +487,7 @@@
         *  less than the max # of CPUs. They should be ignored _iff
         *  they are physically not present.
         */
 -      if (cpu_index >= NR_CPUS) {
 +      if (cpu_index == -1) {
                if (ACPI_FAILURE
                    (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@@ -558,8 -558,8 +558,8 @@@ static int acpi_processor_start(struct 
         */
        if (processor_device_array[pr->id] != NULL &&
            processor_device_array[pr->id] != (void *)device) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id"
-                       "for the processor\n"));
+               printk(KERN_WARNING "BIOS reported wrong ACPI id"
+                       "for the processor\n");
                return_VALUE(-ENODEV);
        }
        processor_device_array[pr->id] = (void *)device;