aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 02:14:45 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 02:14:45 -0400
commitd26f0528d588e596955bf296a609afe52eafc099 (patch)
tree314f7a5637d5517a19f29d64a17e3459505def8f /drivers
parentb963bd39c9000328f6ce4f12aa52abbb0c68ee91 (diff)
parentdf43176c934f2bc01f7615a6e20a4b8e77dcdd11 (diff)
Merge branch 'misc-2.6.32' into release
Conflicts: drivers/pci/dmar.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/bus.c1
-rw-r--r--drivers/acpi/debug.c82
-rw-r--r--drivers/acpi/ec.c1
-rw-r--r--drivers/acpi/pci_slot.c1
-rw-r--r--drivers/acpi/video.c2
-rw-r--r--drivers/pci/dmar.c1
-rw-r--r--drivers/platform/x86/hp-wmi.c2
-rw-r--r--drivers/thermal/Kconfig1
8 files changed, 41 insertions, 50 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 @@
38#include <linux/pci.h> 38#include <linux/pci.h>
39#include <acpi/acpi_bus.h> 39#include <acpi/acpi_bus.h>
40#include <acpi/acpi_drivers.h> 40#include <acpi/acpi_drivers.h>
41#include <linux/dmi.h>
41 42
42#include "internal.h" 43#include "internal.h"
43 44
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 @@
3 */ 3 */
4 4
5#include <linux/proc_fs.h> 5#include <linux/proc_fs.h>
6#include <linux/seq_file.h>
6#include <linux/init.h> 7#include <linux/init.h>
7#include <linux/module.h> 8#include <linux/module.h>
8#include <linux/kernel.h> 9#include <linux/kernel.h>
@@ -201,72 +202,54 @@ module_param_call(trace_state, param_set_trace_state, param_get_trace_state,
201#define ACPI_SYSTEM_FILE_DEBUG_LAYER "debug_layer" 202#define ACPI_SYSTEM_FILE_DEBUG_LAYER "debug_layer"
202#define ACPI_SYSTEM_FILE_DEBUG_LEVEL "debug_level" 203#define ACPI_SYSTEM_FILE_DEBUG_LEVEL "debug_level"
203 204
204static int 205static int acpi_system_debug_proc_show(struct seq_file *m, void *v)
205acpi_system_read_debug(char *page,
206 char **start, off_t off, int count, int *eof, void *data)
207{ 206{
208 char *p = page;
209 int size = 0;
210 unsigned int i; 207 unsigned int i;
211 208
212 if (off != 0) 209 seq_printf(m, "%-25s\tHex SET\n", "Description");
213 goto end;
214 210
215 p += sprintf(p, "%-25s\tHex SET\n", "Description"); 211 switch ((unsigned long)m->private) {
216
217 switch ((unsigned long)data) {
218 case 0: 212 case 0:
219 for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) { 213 for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) {
220 p += sprintf(p, "%-25s\t0x%08lX [%c]\n", 214 seq_printf(m, "%-25s\t0x%08lX [%c]\n",
221 acpi_debug_layers[i].name, 215 acpi_debug_layers[i].name,
222 acpi_debug_layers[i].value, 216 acpi_debug_layers[i].value,
223 (acpi_dbg_layer & acpi_debug_layers[i]. 217 (acpi_dbg_layer & acpi_debug_layers[i].
224 value) ? '*' : ' '); 218 value) ? '*' : ' ');
225 } 219 }
226 p += sprintf(p, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS", 220 seq_printf(m, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS",
227 ACPI_ALL_DRIVERS, 221 ACPI_ALL_DRIVERS,
228 (acpi_dbg_layer & ACPI_ALL_DRIVERS) == 222 (acpi_dbg_layer & ACPI_ALL_DRIVERS) ==
229 ACPI_ALL_DRIVERS ? '*' : (acpi_dbg_layer & 223 ACPI_ALL_DRIVERS ? '*' : (acpi_dbg_layer &
230 ACPI_ALL_DRIVERS) == 224 ACPI_ALL_DRIVERS) ==
231 0 ? ' ' : '-'); 225 0 ? ' ' : '-');
232 p += sprintf(p, 226 seq_printf(m,
233 "--\ndebug_layer = 0x%08X (* = enabled, - = partial)\n", 227 "--\ndebug_layer = 0x%08X (* = enabled, - = partial)\n",
234 acpi_dbg_layer); 228 acpi_dbg_layer);
235 break; 229 break;
236 case 1: 230 case 1:
237 for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) { 231 for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) {
238 p += sprintf(p, "%-25s\t0x%08lX [%c]\n", 232 seq_printf(m, "%-25s\t0x%08lX [%c]\n",
239 acpi_debug_levels[i].name, 233 acpi_debug_levels[i].name,
240 acpi_debug_levels[i].value, 234 acpi_debug_levels[i].value,
241 (acpi_dbg_level & acpi_debug_levels[i]. 235 (acpi_dbg_level & acpi_debug_levels[i].
242 value) ? '*' : ' '); 236 value) ? '*' : ' ');
243 } 237 }
244 p += sprintf(p, "--\ndebug_level = 0x%08X (* = enabled)\n", 238 seq_printf(m, "--\ndebug_level = 0x%08X (* = enabled)\n",
245 acpi_dbg_level); 239 acpi_dbg_level);
246 break; 240 break;
247 default:
248 p += sprintf(p, "Invalid debug option\n");
249 break;
250 } 241 }
242 return 0;
243}
251 244
252 end: 245static int acpi_system_debug_proc_open(struct inode *inode, struct file *file)
253 size = (p - page); 246{
254 if (size <= off + count) 247 return single_open(file, acpi_system_debug_proc_show, PDE(inode)->data);
255 *eof = 1;
256 *start = page + off;
257 size -= off;
258 if (size > count)
259 size = count;
260 if (size < 0)
261 size = 0;
262
263 return size;
264} 248}
265 249
266static int 250static ssize_t acpi_system_debug_proc_write(struct file *file,
267acpi_system_write_debug(struct file *file,
268 const char __user * buffer, 251 const char __user * buffer,
269 unsigned long count, void *data) 252 size_t count, loff_t *pos)
270{ 253{
271 char debug_string[12] = { '\0' }; 254 char debug_string[12] = { '\0' };
272 255
@@ -279,7 +262,7 @@ acpi_system_write_debug(struct file *file,
279 262
280 debug_string[count] = '\0'; 263 debug_string[count] = '\0';
281 264
282 switch ((unsigned long)data) { 265 switch ((unsigned long)PDE(file->f_path.dentry->d_inode)->data) {
283 case 0: 266 case 0:
284 acpi_dbg_layer = simple_strtoul(debug_string, NULL, 0); 267 acpi_dbg_layer = simple_strtoul(debug_string, NULL, 0);
285 break; 268 break;
@@ -292,6 +275,15 @@ acpi_system_write_debug(struct file *file,
292 275
293 return count; 276 return count;
294} 277}
278
279static const struct file_operations acpi_system_debug_proc_fops = {
280 .owner = THIS_MODULE,
281 .open = acpi_system_debug_proc_open,
282 .read = seq_read,
283 .llseek = seq_lseek,
284 .release = single_release,
285 .write = acpi_system_debug_proc_write,
286};
295#endif 287#endif
296 288
297int __init acpi_debug_init(void) 289int __init acpi_debug_init(void)
@@ -303,24 +295,18 @@ int __init acpi_debug_init(void)
303 295
304 /* 'debug_layer' [R/W] */ 296 /* 'debug_layer' [R/W] */
305 name = ACPI_SYSTEM_FILE_DEBUG_LAYER; 297 name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
306 entry = 298 entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,
307 create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR, 299 acpi_root_dir, &acpi_system_debug_proc_fops,
308 acpi_root_dir, acpi_system_read_debug, 300 (void *)0);
309 (void *)0); 301 if (!entry)
310 if (entry)
311 entry->write_proc = acpi_system_write_debug;
312 else
313 goto Error; 302 goto Error;
314 303
315 /* 'debug_level' [R/W] */ 304 /* 'debug_level' [R/W] */
316 name = ACPI_SYSTEM_FILE_DEBUG_LEVEL; 305 name = ACPI_SYSTEM_FILE_DEBUG_LEVEL;
317 entry = 306 entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,
318 create_proc_read_entry(name, S_IFREG | S_IRUGO | S_IWUSR, 307 acpi_root_dir, &acpi_system_debug_proc_fops,
319 acpi_root_dir, acpi_system_read_debug, 308 (void *)1);
320 (void *)1); 309 if (!entry)
321 if (entry)
322 entry->write_proc = acpi_system_write_debug;
323 else
324 goto Error; 310 goto Error;
325 311
326 Done: 312 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 @@
42#include <asm/io.h> 42#include <asm/io.h>
43#include <acpi/acpi_bus.h> 43#include <acpi/acpi_bus.h>
44#include <acpi/acpi_drivers.h> 44#include <acpi/acpi_drivers.h>
45#include <linux/dmi.h>
45 46
46#define ACPI_EC_CLASS "embedded_controller" 47#define ACPI_EC_CLASS "embedded_controller"
47#define ACPI_EC_DEVICE_NAME "Embedded Controller" 48#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 @@
31#include <linux/acpi.h> 31#include <linux/acpi.h>
32#include <acpi/acpi_bus.h> 32#include <acpi/acpi_bus.h>
33#include <acpi/acpi_drivers.h> 33#include <acpi/acpi_drivers.h>
34#include <linux/dmi.h>
34 35
35static int debug; 36static int debug;
36static int check_sta_before_sun; 37static 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 @@
40#include <linux/pci.h> 40#include <linux/pci.h>
41#include <linux/pci_ids.h> 41#include <linux/pci_ids.h>
42#include <asm/uaccess.h> 42#include <asm/uaccess.h>
43 43#include <linux/dmi.h>
44#include <acpi/acpi_bus.h> 44#include <acpi/acpi_bus.h>
45#include <acpi/acpi_drivers.h> 45#include <acpi/acpi_drivers.h>
46 46
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 @@
34#include <linux/irq.h> 34#include <linux/irq.h>
35#include <linux/interrupt.h> 35#include <linux/interrupt.h>
36#include <linux/tboot.h> 36#include <linux/tboot.h>
37#include <linux/dmi.h>
37 38
38#define PREFIX "DMAR: " 39#define PREFIX "DMAR: "
39 40
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)
507 } 507 }
508 if (bluetooth_rfkill) { 508 if (bluetooth_rfkill) {
509 rfkill_unregister(bluetooth_rfkill); 509 rfkill_unregister(bluetooth_rfkill);
510 rfkill_destroy(wifi_rfkill); 510 rfkill_destroy(bluetooth_rfkill);
511 } 511 }
512 if (wwan_rfkill) { 512 if (wwan_rfkill) {
513 rfkill_unregister(wwan_rfkill); 513 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
15 15
16config THERMAL_HWMON 16config THERMAL_HWMON
17 bool "Hardware monitoring support" 17 bool "Hardware monitoring support"
18 depends on THERMAL
18 depends on HWMON=y || HWMON=THERMAL 19 depends on HWMON=y || HWMON=THERMAL
19 help 20 help
20 The generic thermal sysfs driver's hardware monitoring support 21 The generic thermal sysfs driver's hardware monitoring support