Merge branch 'misc' into release

diff --git a/MAINTAINERS b/MAINTAINERS
index 4ee59641c16c6782e4dd05bf5cfa219d64e282fe..e40379e31921c2e49e7f82a735f813f63b7b4dc3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4291,10 +4291,7 @@ W:       http://sourceforge.net/projects/tlan/
 S:     Maintained
 
 TOSHIBA ACPI EXTRAS DRIVER
-P:     John Belmonte
-M:     toshiba_acpi@memebeam.org
-W:     http://memebeam.org/toys/ToshibaAcpiDriver
-S:     Maintained
+S:     Orphan
 
 TOSHIBA SMM DRIVER
 P:     Jonathan Buzzard

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 565e70c7ca9326859783325f4c9434dd83dd9d94..4f942096291d6f76d8e01d12fb11424acaff7bc0 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1548,7 +1548,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
 
 /*
  * If your system is blacklisted here, but you find that acpi=force
- * works for you, please contact acpi-devel@sourceforge.net
+ * works for you, please contact linux-acpi@vger.kernel.org
  */
 static struct dmi_system_id __initdata acpi_dmi_table[] = {
        /*

diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 4b1c319d30c368592e990663fb1c8efd5abea963..89c676d6caf7327fec9218384e56b2a85b0f0229 100644 (file)
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -680,6 +680,18 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                            perf->states[i].transition_latency * 1000;
        }
 
+       /* Check for high latency (>20uS) from buggy BIOSes, like on T42 */
+       if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
+           policy->cpuinfo.transition_latency > 20 * 1000) {
+               static int print_once;
+               policy->cpuinfo.transition_latency = 20 * 1000;
+               if (!print_once) {
+                       print_once = 1;
+                       printk(KERN_INFO "Capping off P-state tranision latency"
+                               " at 20 uS\n");
+               }
+       }
+
        data->max_freq = perf->states[0].core_frequency * 1000;
        /* table init */
        for (i=0; i<perf->state_count; i++) {

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 35094f230b1e339d2d969ca27cb89816c7d3d9de..8f62fa01a9c76f910d1c88d4245f18eeab995708 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -1146,9 +1146,10 @@ static int __init dock_init(void)
 static void __exit dock_exit(void)
 {
        struct dock_station *dock_station;
+       struct dock_station *tmp;
 
        unregister_acpi_bus_notifier(&dock_acpi_notifier);
-       list_for_each_entry(dock_station, &dock_stations, sibiling)
+       list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibiling)
                dock_remove(dock_station);
 }
 

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index be6b9093f8dfc19d3c9ba1befb7a1ede37fa3026..51b9f8280f887cfd6649a39446e7e081d52fe3b6 100644 (file)
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -86,7 +86,7 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(struct pci_dev *dev,
 }
 
 /* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
-static struct dmi_system_id medion_md9580[] = {
+static const struct dmi_system_id medion_md9580[] = {
        {
                .ident = "Medion MD9580-F laptop",
                .matches = {
@@ -98,7 +98,7 @@ static struct dmi_system_id medion_md9580[] = {
 };
 
 /* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
-static struct dmi_system_id dell_optiplex[] = {
+static const struct dmi_system_id dell_optiplex[] = {
        {
                .ident = "Dell Optiplex GX1",
                .matches = {
@@ -110,7 +110,7 @@ static struct dmi_system_id dell_optiplex[] = {
 };
 
 /* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
-static struct dmi_system_id hp_t5710[] = {
+static const struct dmi_system_id hp_t5710[] = {
        {
                .ident = "HP t5710",
                .matches = {
@@ -123,13 +123,13 @@ static struct dmi_system_id hp_t5710[] = {
 };
 
 struct prt_quirk {
-       struct dmi_system_id    *system;
+       const struct dmi_system_id *system;
        unsigned int            segment;
        unsigned int            bus;
        unsigned int            device;
        unsigned char           pin;
-       char                    *source;        /* according to BIOS */
-       char                    *actual_source;
+       const char              *source;        /* according to BIOS */
+       const char              *actual_source;
 };
 
 #define PCI_INTX_PIN(c)                (c - 'A' + 1)
@@ -139,7 +139,7 @@ struct prt_quirk {
  * interrupt at the listed segment/bus/device/pin is connected to the first
  * link device, but it is actually connected to the second.
  */
-static struct prt_quirk prt_quirks[] = {
+static const struct prt_quirk prt_quirks[] = {
        { medion_md9580, 0, 0, 9, PCI_INTX_PIN('A'),
                "\\_SB_.PCI0.ISA_.LNKA",
                "\\_SB_.PCI0.ISA_.LNKB"},
@@ -155,7 +155,7 @@ static void do_prt_fixups(struct acpi_prt_entry *entry,
                          struct acpi_pci_routing_table *prt)
 {
        int i;
-       struct prt_quirk *quirk;
+       const struct prt_quirk *quirk;
 
        for (i = 0; i < ARRAY_SIZE(prt_quirks); i++) {
                quirk = &prt_quirks[i];

diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 73aed5f5b973e73a500b0fad3abe230107ec26cf..d0d1f4d5043442718c9c361fce497a0ca38b9cbe 100644 (file)
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -783,11 +783,9 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
                    (struct acpi_processor_tx_tss *)&(pr->throttling.
                                                      states_tss[i]);
                if (tx->control == value)
-                       break;
+                       return i;
        }
-       if (i > pr->throttling.state_count)
-               i = -1;
-       return i;
+       return -1;
 }
 
 static int acpi_get_throttling_value(struct acpi_processor *pr,

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 91a284b54dbf5ca73fc2804641de0537ce4618bf..779e4e500df4b78ae84f4cb598dae38bf241f149 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -396,6 +396,15 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"),
                },
        },
+       {
+       .callback = init_old_suspend_ordering,
+       .ident = "Panasonic CF51-2L",
+       .matches = {
+               DMI_MATCH(DMI_BOARD_VENDOR,
+                               "Matsushita Electric Industrial Co.,Ltd."),
+               DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
+               },
+       },
        {},
 };
 #endif /* CONFIG_SUSPEND */

diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index c47a44dcb702abf97f52ce86fec941a9f5a17318..a5ce4bc202e33663da13eceb1bc763270fa419d9 100644 (file)
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -184,6 +184,7 @@ static const struct acpi_device_id pcc_device_ids[] = {
        { "MAT0019", 0},
        { "", 0},
 };
+MODULE_DEVICE_TABLE(acpi, pcc_device_ids);
 
 static struct acpi_driver acpi_pcc_driver = {
        .name =         ACPI_PCC_DRIVER_NAME,
@@ -366,7 +367,7 @@ static ssize_t show_numbatt(struct device *dev, struct device_attribute *attr,
        if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf))
                return -EIO;
 
-       return sprintf(buf, "%u\n", pcc->sinf[SINF_NUM_BATTERIES]);
+       return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_NUM_BATTERIES]);
 }
 
 static ssize_t show_lcdtype(struct device *dev, struct device_attribute *attr,
@@ -378,7 +379,7 @@ static ssize_t show_lcdtype(struct device *dev, struct device_attribute *attr,
        if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf))
                return -EIO;
 
-       return sprintf(buf, "%u\n", pcc->sinf[SINF_LCD_TYPE]);
+       return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_LCD_TYPE]);
 }
 
 static ssize_t show_mute(struct device *dev, struct device_attribute *attr,
@@ -390,7 +391,7 @@ static ssize_t show_mute(struct device *dev, struct device_attribute *attr,
        if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf))
                return -EIO;
 
-       return sprintf(buf, "%u\n", pcc->sinf[SINF_MUTE]);
+       return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_MUTE]);
 }
 
 static ssize_t show_sticky(struct device *dev, struct device_attribute *attr,
@@ -402,7 +403,7 @@ static ssize_t show_sticky(struct device *dev, struct device_attribute *attr,
        if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf))
                return -EIO;
 
-       return sprintf(buf, "%u\n", pcc->sinf[SINF_STICKY_KEY]);
+       return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_STICKY_KEY]);
 }
 
 static ssize_t set_sticky(struct device *dev, struct device_attribute *attr,

diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
index b4a4aa9ee482edacecb4224b4245ee8db2ba0c7f..44166003d4ef15f12b73ee71bff7f2fadcd9181e 100644 (file)
--- a/drivers/platform/x86/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
@@ -94,9 +94,8 @@ static int get_state(u32 *out, u8 instance)
                return -ENODEV;
 
        obj = (union acpi_object *) result.pointer;
-       if (obj && obj->type == ACPI_TYPE_BUFFER &&
-               obj->buffer.length == sizeof(u32)) {
-               tmp = *((u32 *) obj->buffer.pointer);
+       if (obj && obj->type == ACPI_TYPE_INTEGER) {
+               tmp = obj->integer.value;
        } else {
                tmp = 0;
        }
@@ -109,7 +108,7 @@ static int get_state(u32 *out, u8 instance)
                *out = (tmp == 3) ? 1 : 0;
                return 0;
        case TC1100_INSTANCE_JOGDIAL:
-               *out = (tmp == 1) ? 1 : 0;
+               *out = (tmp == 1) ? 0 : 1;
                return 0;
        default:
                return -ENODEV;