Merge branch 'bjorn-initcall-cleanup' into release

diff --combined drivers/acpi/bus.c
index bee64b73c91957ebe06fe978b579f5326ede12fd,7fe0945f7bcff7a3e2001ae5a1e44a8bdb6b1366..e8f7b64e92da7e2b153d6d43b5377dffccac824c
--- 1/drivers/acpi/bus.c
--- 2/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@@ -39,6 -39,8 +39,8 @@@
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
  
+ #include "internal.h"
+ 
  #define _COMPONENT            ACPI_BUS_COMPONENT
  ACPI_MODULE_NAME("bus");
  
@@@ -758,7 -760,8 +760,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);
@@@ -768,6 -771,12 +770,6 @@@
                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()
@@@ -846,6 -855,7 +848,7 @@@ static int __init acpi_init(void
                acpi_kobj = NULL;
        }
  
+       init_acpi_device_notify();
        result = acpi_bus_init();
  
        if (!result) {
@@@ -860,11 -870,23 +863,23 @@@
                }
        } else
                disable_acpi();
+ 
+       if (acpi_disabled)
+               return result;
+ 
        /*
         * If the laptop falls into the DMI check table, the power state check
         * will be disabled in the course of device power transistion.
         */
        dmi_check_system(power_nocheck_dmi_table);
+ 
+       acpi_scan_init();
+       acpi_ec_init();
+       acpi_power_init();
+       acpi_system_init();
+       acpi_debug_init();
+       acpi_sleep_proc_init();
+       acpi_wakeup_device_init();
        return result;
  }
  

diff --combined drivers/acpi/sleep.c
index 837ac7d5801bc722aba89c2340f0bd2cb72ec150,0f86cf74216bf6a3b86df63ae74e031bc6eb6e53..91a284b54dbf5ca73fc2804641de0537ce4618bf
--- 1/drivers/acpi/sleep.c
--- 2/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@ -21,6 -21,8 +21,8 @@@
  
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
+ 
+ #include "internal.h"
  #include "sleep.h"
  
  u8 sleep_states[ACPI_S_STATE_COUNT];
@@@ -248,7 -250,7 +250,7 @@@ static int acpi_suspend_enter(suspend_s
  
        /* If ACPI is not enabled by the BIOS, we need to enable it here. */
        if (set_sci_en_on_resume)
 -              acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
 +              acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
        else
                acpi_enable();
  
@@@ -378,22 -380,6 +380,22 @@@ static struct dmi_system_id __initdata 
                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 */