Merge branches 'release', 'dmi', 'idle' and 'misc' into release

diff --combined drivers/acpi/osl.c
index 0467171dbdb8776f6bf8b2fbdf2f08156c0d1cc5,15e602377655349d22423c82afe62f33623c2929,b51954d80ef984980fedd00b402916fc9c722d67..8edba7b678eb9d33493f422472dc16fdb4c6f84e
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
--- 3/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@@ -325,7 -325,7 -325,7 +325,7 @@@@ acpi_os_predefined_override(const struc
   }
   
   #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-- struct acpi_table_header *acpi_find_dsdt_initrd(void)
++ static struct acpi_table_header *acpi_find_dsdt_initrd(void)
   {
        struct file *firmware_file;
        mm_segment_t oldfs;
@@@@ -419,7 -419,7 -419,7 +419,7 @@@@ acpi_os_table_override(struct acpi_tabl
   }
   
   #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-- int __init acpi_no_initrd_override_setup(char *s)
++ static int __init acpi_no_initrd_override_setup(char *s)
   {
        acpi_no_initrd_override = 1;
        return 1;
@@@@ -1109,7 -1109,7 -1109,7 +1109,7 @@@@ void __init acpi_dmi_osi_linux(int enab
    * string starting with '!' disables that string
    * otherwise string is added to list, augmenting built-in strings
    */
 --static int __init acpi_osi_setup(char *str)
 ++int __init acpi_osi_setup(char *str)
   {
        if (str == NULL || *str == '\0') {
                printk(KERN_INFO PREFIX "_OSI method disabled\n");

diff --combined drivers/acpi/processor_idle.c
index 32003fdc91e8a4b0205f3fbf2bedfbfc91260399,baa389b908e2bd827f1b22cf6619bf6e585f2e81,1f022b0846d477c00a01251dedd4aba5dbf12d4d..980e1c33e6c5eeb11a7ec91132c2aa1cb614ef0a
--- 1/drivers/acpi/processor_idle.c
--- 2/drivers/acpi/processor_idle.c
--- 3/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@@ -945,11 -945,16 -945,11 +945,16 @@@@ static int acpi_processor_get_power_inf
                                 * Otherwise, ignore this info and continue.
                                 */
                                cx.entry_method = ACPI_CSTATE_HALT;
+ +                             snprintf(cx.desc, ACPI_CX_DESC_LEN, "ACPI HLT");
                        } else {
                                continue;
                        }
+ +             } else {
+ +                     snprintf(cx.desc, ACPI_CX_DESC_LEN, "ACPI IOPORT 0x%x",
+ +                              cx.address);
                }
   
+ +
                obj = &(element->package.elements[2]);
                if (obj->type != ACPI_TYPE_INTEGER)
                        continue;
@@@@ -1420,6 -1425,6 -1420,14 +1425,14 @@@@ static int acpi_idle_enter_c1(struct cp
                return 0;
   
        local_irq_disable();
++ 
++      /* Do not access any ACPI IO ports in suspend path */
++      if (acpi_idle_suspend) {
++              acpi_safe_halt();
++              local_irq_enable();
++              return 0;
++      }
++ 
        if (pr->flags.bm_check)
                acpi_idle_update_bm_rld(pr, cx);
   
@@@@ -1643,6 -1648,11 -1651,6 +1656,11 @@@@ static int acpi_processor_setup_cpuidle
                return -EINVAL;
        }
   
+ +     for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
+ +             dev->states[i].name[0] = '\0';
+ +             dev->states[i].desc[0] = '\0';
+ +     }
+ +
        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
                cx = &pr->power.states[i];
                state = &dev->states[count];
@@@@ -1659,6 -1669,7 -1667,6 +1677,7 @@@@
                cpuidle_set_statedata(state, cx);
   
                snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);
+ +             strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);
                state->exit_latency = cx->latency;
                state->target_residency = cx->latency * latency_factor;
                state->power_usage = cx->power;