Pull misc-for-upstream into release branch

10 files changed, 33 insertions, 32 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 45c43150826b..e905c950fd7b 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -85,8 +85,8 @@ config ACPI_PROCFS
         depends on ACPI
         default y
         ---help---
-          Procfs interface for ACPI is made optional for back-compatible.
-          As the same functions are duplicated in sysfs interface
+          The Procfs interface for ACPI is made optional for backward compatibility.
+          As the same functions are duplicated in the sysfs interface
           and this proc interface will be removed some time later,
           it's marked as deprecated.
           ( /proc/acpi/debug_layer && debug_level are deprecated by
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index c26172671fd8..e65628a03085 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -44,11 +44,6 @@ MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
 MODULE_DESCRIPTION("Hotplug Mem Driver");
 MODULE_LICENSE("GPL");
 
-/* ACPI _STA method values */
-#define ACPI_MEMORY_STA_PRESENT         (0x00000001UL)
-#define ACPI_MEMORY_STA_ENABLED         (0x00000002UL)
-#define ACPI_MEMORY_STA_FUNCTIONAL      (0x00000008UL)
-
 /* Memory Device States */
 #define MEMORY_INVALID_STATE    0
 #define MEMORY_POWER_ON_STATE   1
@@ -204,9 +199,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
          * Check for device status. Device should be
          * present/enabled/functioning.
          */
-        if (!((current_status & ACPI_MEMORY_STA_PRESENT)
-              && (current_status & ACPI_MEMORY_STA_ENABLED)
-              && (current_status & ACPI_MEMORY_STA_FUNCTIONAL)))
+        if (!((current_status & ACPI_STA_DEVICE_PRESENT)
+              && (current_status & ACPI_STA_DEVICE_ENABLED)
+              && (current_status & ACPI_STA_DEVICE_FUNCTIONING)))
                 return -ENODEV;
 
         return 0;
@@ -286,7 +281,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device)
                 return -ENODEV;
 
         /* Check for device status.  Device should be disabled */
-        if (current_status & ACPI_MEMORY_STA_ENABLED)
+        if (current_status & ACPI_STA_DEVICE_ENABLED)
                 return -EINVAL;
 
         return 0;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index dd49ea0d0ed3..e5084ececb6f 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -103,7 +103,9 @@ int acpi_bus_get_status(struct acpi_device *device)
         else if (device->parent)
                 device->status = device->parent->status;
         else
-                STRUCT_TO_INT(device->status) = 0x0F;
+                STRUCT_TO_INT(device->status) =
+                    ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED |
+                    ACPI_STA_DEVICE_UI      | ACPI_STA_DEVICE_FUNCTIONING;
 
         if (device->status.functional && !device->status.present) {
                 printk(KERN_WARNING PREFIX "Device [%s] status [%08x]: "
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 0930d9413dfa..0dd3bf7c0ed1 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -49,8 +49,6 @@ MODULE_AUTHOR("Anil S Keshavamurthy");
 MODULE_DESCRIPTION("ACPI container driver");
 MODULE_LICENSE("GPL");
 
-#define ACPI_STA_PRESENT                (0x00000001)
-
 static int acpi_container_add(struct acpi_device *device);
 static int acpi_container_remove(struct acpi_device *device, int type);
 
@@ -75,13 +73,13 @@ static int is_device_present(acpi_handle handle)
 
         status = acpi_get_handle(handle, "_STA", &temp);
         if (ACPI_FAILURE(status))
-                return 1;       /* _STA not found, assmue device present */
+                return 1;       /* _STA not found, assume device present */
 
         status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
         if (ACPI_FAILURE(status))
                 return 0;       /* Firmware error */
 
-        return ((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT);
+        return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
 }
 
 /*******************************************************************/
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 99d1516d1e70..f7de02a6f497 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -70,8 +70,6 @@
 #define ACPI_PROCESSOR_LIMIT_USER       0
 #define ACPI_PROCESSOR_LIMIT_THERMAL    1
 
-#define ACPI_STA_PRESENT 0x00000001
-
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_core");
 
@@ -779,7 +777,7 @@ static int is_processor_present(acpi_handle handle)
 
 
         status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        if (ACPI_FAILURE(status) || !(sta & ACPI_STA_PRESENT)) {
+        if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_PRESENT)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));
                 return 0;
         }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index cdf78943af4d..ae0654cd11ea 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -51,14 +51,6 @@
 #include <asm/apic.h>
 #endif
 
-/*
- * Include the apic definitions for x86 to have the APIC timer related defines
- * available also for UP (on SMP it gets magically included via linux/smp.h).
- */
-#ifdef CONFIG_X86
-#include <asm/apic.h>
-#endif
-
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index bb0e0da39fb1..d80dd84e5bfd 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1068,7 +1068,9 @@ acpi_add_single_object(struct acpi_device **child,
                 }
                 break;
         default:
-                STRUCT_TO_INT(device->status) = 0x0F;
+                STRUCT_TO_INT(device->status) =
+                    ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED |
+                    ACPI_STA_DEVICE_UI      | ACPI_STA_DEVICE_FUNCTIONING;
                 break;
         }
 
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index ccc11b33d89c..2d912b71e543 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -350,21 +350,31 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 {
         struct list_head *node, *next;
 
-        seq_printf(seq, "Device Sleep state     Status\n");
+        seq_printf(seq, "Device\tS-state\t  Status   Sysfs node\n");
 
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                     container_of(node, struct acpi_device, wakeup_list);
+                struct device *ldev;
 
                 if (!dev->wakeup.flags.valid)
                         continue;
                 spin_unlock(&acpi_device_lock);
-                seq_printf(seq, "%4s    %4d             %s%8s\n",
+
+                ldev = acpi_get_physical_device(dev->handle);
+                seq_printf(seq, "%s\t  S%d\t%c%-8s  ",
                            dev->pnp.bus_id,
                            (u32) dev->wakeup.sleep_state,
-                           dev->wakeup.flags.run_wake ? "*" : "",
+                           dev->wakeup.flags.run_wake ? '*' : ' ',
                            dev->wakeup.state.enabled ? "enabled" : "disabled");
+                if (ldev)
+                        seq_printf(seq, "%s:%s",
+                                ldev->bus ? ldev->bus->name : "no-bus",
+                                ldev->bus_id);
+                seq_printf(seq, "\n");
+                put_device(ldev);
+
                 spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 5ac309ee7f05..5cfcff532545 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -26,7 +26,7 @@
 /*
  * The I/O port the PMTMR resides at.
  * The location is detected during setup_arch(),
- * in arch/i386/acpi/boot.c
+ * in arch/i386/kernel/acpi/boot.c
  */
 u32 pmtmr_ioport __read_mostly;
 
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index a064f36a0805..b5ac810404c0 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -317,6 +317,10 @@ static int __init acpi_pci_init(void)
 {
         int ret;
 
+        if (acpi_gbl_FADT.boot_flags & BAF_MSI_NOT_SUPPORTED) {
+                printk(KERN_INFO"ACPI FADT declares the system doesn't support MSI, so disable it\n");
+                pci_no_msi();
+        }
         ret = register_acpi_bus_type(&acpi_pci_bus);
         if (ret)
                 return 0;