Merge branch 'misc-2.6.32' into release

Conflicts:
	drivers/pci/dmar.c

Signed-off-by: Len Brown <len.brown@intel.com>

9 files changed, 41 insertions, 54 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 620183f13e5e..135fbfe1825c 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -38,6 +38,7 @@
 #include <linux/pci.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 #include "internal.h"
 
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
index a8287be0870e..8a690c3b8e23 100644
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -201,72 +202,54 @@ module_param_call(trace_state, param_set_trace_state, param_get_trace_state,
 #define ACPI_SYSTEM_FILE_DEBUG_LAYER    "debug_layer"
 #define ACPI_SYSTEM_FILE_DEBUG_LEVEL            "debug_level"
 
-static int
-acpi_system_read_debug(char *page,
-                       char **start, off_t off, int count, int *eof, void *data)
+static int acpi_system_debug_proc_show(struct seq_file *m, void *v)
 {
-        char *p = page;
-        int size = 0;
         unsigned int i;
 
-        if (off != 0)
-                goto end;
+        seq_printf(m, "%-25s\tHex        SET\n", "Description");
 
-        p += sprintf(p, "%-25s\tHex        SET\n", "Description");
-
-        switch ((unsigned long)data) {
+        switch ((unsigned long)m->private) {
         case 0:
                 for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) {
-                        p += sprintf(p, "%-25s\t0x%08lX [%c]\n",
+                        seq_printf(m, "%-25s\t0x%08lX [%c]\n",
                                      acpi_debug_layers[i].name,
                                      acpi_debug_layers[i].value,
                                      (acpi_dbg_layer & acpi_debug_layers[i].
                                       value) ? '*' : ' ');
                 }
-                p += sprintf(p, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS",
+                seq_printf(m, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS",
                              ACPI_ALL_DRIVERS,
                              (acpi_dbg_layer & ACPI_ALL_DRIVERS) ==
                              ACPI_ALL_DRIVERS ? '*' : (acpi_dbg_layer &
                                                        ACPI_ALL_DRIVERS) ==
                              0 ? ' ' : '-');
-                p += sprintf(p,
+                seq_printf(m,
                              "--\ndebug_layer = 0x%08X (* = enabled, - = partial)\n",
                              acpi_dbg_layer);
                 break;
         case 1:
                 for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) {
-                        p += sprintf(p, "%-25s\t0x%08lX [%c]\n",
+                        seq_printf(m, "%-25s\t0x%08lX [%c]\n",
                                      acpi_debug_levels[i].name,
                                      acpi_debug_levels[i].value,
                                      (acpi_dbg_level & acpi_debug_levels[i].
                                       value) ? '*' : ' ');
                 }
-                p += sprintf(p, "--\ndebug_level = 0x%08X (* = enabled)\n",
+                seq_printf(m, "--\ndebug_level = 0x%08X (* = enabled)\n",
                              acpi_dbg_level);
                 break;
-        default:
-                p += sprintf(p, "Invalid debug option\n");
-                break;
         }
+        return 0;
+}
 
-      end:
-        size = (p - page);
-        if (size <= off + count)
-                *eof = 1;
-        *start = page + off;
-        size -= off;
-        if (size > count)
-                size = count;
-        if (size < 0)
-                size = 0;
-
-        return size;
+static int acpi_system_debug_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, acpi_system_debug_proc_show, PDE(inode)->data);
 }
 
-static int
-acpi_system_write_debug(struct file *file,
+static ssize_t acpi_system_debug_proc_write(struct file *file,
                         const char __user * buffer,
-                        unsigned long count, void *data)
+                        size_t count, loff_t *pos)
 {
         char debug_string[12] = { '\0' };
 
@@ -279,7 +262,7 @@ acpi_system_write_debug(struct file *file,
 
         debug_string[count] = '\0';
 
-        switch ((unsigned long)data) {
+        switch ((unsigned long)PDE(file->f_path.dentry->d_inode)->data) {
         case 0:
                 acpi_dbg_layer = simple_strtoul(debug_string, NULL, 0);
                 break;
@@ -292,6 +275,15 @@ acpi_system_write_debug(struct file *file,
 
         return count;
 }
+
+static const struct file_operations acpi_system_debug_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = acpi_system_debug_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = acpi_system_debug_proc_write,
+};
 #endif
 
 int __init acpi_debug_init(void)
@@ -303,24 +295,18 @@ int __init acpi_debug_init(void)
 
         /* 'debug_layer' [R/W] */
         name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
-        entry =
-            create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR,
-                                   acpi_root_dir, acpi_system_read_debug,
-                                   (void *)0);
-        if (entry)
-                entry->write_proc = acpi_system_write_debug;
-        else
+        entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,
+                                 acpi_root_dir, &acpi_system_debug_proc_fops,
+                                 (void *)0);
+        if (!entry)
                 goto Error;
 
         /* 'debug_level' [R/W] */
         name = ACPI_SYSTEM_FILE_DEBUG_LEVEL;
-        entry =
-            create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR,
-                                   acpi_root_dir, acpi_system_read_debug,
-                                   (void *)1);
-        if (entry)
-                entry->write_proc = acpi_system_write_debug;
-        else
+        entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,
+                                 acpi_root_dir, &acpi_system_debug_proc_fops,
+                                 (void *)1);
+        if (!entry)
                 goto Error;
 
       Done:
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 08b8cf79946b..f70796081c4c 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -42,6 +42,7 @@
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 #define ACPI_EC_CLASS                   "embedded_controller"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index da9d6d25cf6d..45da2bae36c8 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -31,6 +31,7 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 static int debug;
 static int check_sta_before_sun;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9b578b53252d..902fd526f328 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -40,7 +40,7 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <asm/uaccess.h>
-
+#include <linux/dmi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 47aa5938fb04..5f6b915d0d82 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -34,6 +34,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/tboot.h>
+#include <linux/dmi.h>
 
 #define PREFIX "DMAR: "
 
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index af04f5b049db..c2842171cec6 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -507,7 +507,7 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)
         }
         if (bluetooth_rfkill) {
                 rfkill_unregister(bluetooth_rfkill);
-                rfkill_destroy(wifi_rfkill);
+                rfkill_destroy(bluetooth_rfkill);
         }
         if (wwan_rfkill) {
                 rfkill_unregister(wwan_rfkill);
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index a86e952ed4ca..bf7c687519ef 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -15,6 +15,7 @@ menuconfig THERMAL
 
 config THERMAL_HWMON
         bool "Hardware monitoring support"
+        depends on THERMAL
         depends on HWMON=y || HWMON=THERMAL
         help
           The generic thermal sysfs driver's hardware monitoring support
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3fce811bf9ac..dfcd920c3e54 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -41,8 +41,6 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_numa.h>
 #include <asm/acpi.h>
-#include <linux/dmi.h>
-
 
 enum acpi_irq_model_id {
         ACPI_IRQ_MODEL_PIC = 0,
@@ -219,10 +217,8 @@ static inline int acpi_video_display_switch_support(void)
 #endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */
 
 extern int acpi_blacklisted(void);
-#ifdef CONFIG_DMI
 extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
 extern int acpi_osi_setup(char *str);
-#endif
 
 #ifdef CONFIG_ACPI_NUMA
 int acpi_get_pxm(acpi_handle handle);