Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c

5 files changed, 19 insertions, 60 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 765fd1c56cd6..bee64b73c919 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -758,8 +758,7 @@ static int __init acpi_bus_init(void)
         acpi_status status = AE_OK;
         extern acpi_status acpi_os_initialize1(void);
 
-
-        status = acpi_os_initialize1();
+        acpi_os_initialize1();
 
         status =
             acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);
@@ -769,12 +768,6 @@ static int __init acpi_bus_init(void)
                 goto error1;
         }
 
-        if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR PREFIX
-                       "Unable to initialize ACPI OS objects\n");
-                goto error1;
-        }
-
         /*
          * ACPI 2.0 requires the EC driver to be loaded and work before
          * the EC device is found in the namespace (i.e. before acpi_initialize_objects()
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 35094f230b1e..7af7db1ba8c4 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -977,7 +977,7 @@ static int dock_add(acpi_handle handle)
                 sizeof(struct dock_station *));
 
         /* we want the dock device to send uevents */
-        dock_device->dev.uevent_suppress = 0;
+        dev_set_uevent_suppress(&dock_device->dev, 0);
 
         if (is_dock(handle))
                 dock_station->flags |= DOCK_IS_DOCK;
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index c5e292aab0e3..3a0d8ef25c75 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -277,7 +277,7 @@ int acpi_get_node(acpi_handle *handle)
         int pxm, node = -1;
 
         pxm = acpi_get_pxm(handle);
-        if (pxm >= 0)
+        if (pxm >= 0 && pxm < MAX_PXM_DOMAINS)
                 node = acpi_map_pxm_to_node(pxm);
 
         return node;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index b3193ec0a2ef..1e35f342957c 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1317,54 +1317,6 @@ acpi_os_validate_interface (char *interface)
         return AE_SUPPORT;
 }
 
-#ifdef  CONFIG_X86
-
-struct aml_port_desc {
-        uint    start;
-        uint    end;
-        char*   name;
-        char    warned;
-};
-
-static struct aml_port_desc aml_invalid_port_list[] = {
-        {0x20, 0x21, "PIC0", 0},
-        {0xA0, 0xA1, "PIC1", 0},
-        {0x4D0, 0x4D1, "ELCR", 0}
-};
-
-/*
- * valid_aml_io_address()
- *
- * if valid, return true
- * else invalid, warn once, return false
- */
-static bool valid_aml_io_address(uint address, uint length)
-{
-        int i;
-        int entries = sizeof(aml_invalid_port_list) / sizeof(struct aml_port_desc);
-
-        for (i = 0; i < entries; ++i) {
-                if ((address >= aml_invalid_port_list[i].start &&
-                        address <= aml_invalid_port_list[i].end) ||
-                        (address + length >= aml_invalid_port_list[i].start &&
-                        address  + length <= aml_invalid_port_list[i].end))
-                {
-                        if (!aml_invalid_port_list[i].warned)
-                        {
-                                printk(KERN_ERR "ACPI: Denied BIOS AML access"
-                                        " to invalid port 0x%x+0x%x (%s)\n",
-                                        address, length,
-                                        aml_invalid_port_list[i].name);
-                                aml_invalid_port_list[i].warned = 1;
-                        }
-                        return false;   /* invalid */
-                }
-        }
-        return true;    /* valid */
-}
-#else
-static inline bool valid_aml_io_address(uint address, uint length) { return true; }
-#endif
 /******************************************************************************
  *
  * FUNCTION:    acpi_os_validate_address
@@ -1394,8 +1346,6 @@ acpi_os_validate_address (
 
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
-                if (!valid_aml_io_address(address, length))
-                        return AE_AML_ILLEGAL_ADDRESS;
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                 /* Only interference checks against SystemIO and SytemMemory
                    are needed */
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 519266654f06..00456fccfa38 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -378,6 +378,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"),
                 },
         },
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
+                DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
+                },
+        },
+        {
+        .callback = init_set_sci_en_on_resume,
+        .ident = "Toshiba Satellite L300",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"),
+                },
+        },
         {},
 };
 #endif /* CONFIG_SUSPEND */