Hand Merge

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc arch/i386/kernel/dmi_scan.c
index 519112155c0f464288b8ec2487f101292c9c7ccc,ef91655c2568b3690eb474bd7c1a99a100c38be1..a63a540753e92356db8192354bb675793bf773e5
--- 1/arch/i386/kernel/dmi_scan.c
--- 2/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@@ -162,6 -162,24 +162,23 @@@ enu
  
  static char *dmi_ident[DMI_STRING_MAX];
  
 -
+ #ifdef CONFIG_ACPI_BOOT
+ 
+ /* print some information suitable for a blacklist entry. */
+ static void dmi_dump_system(void)
+ { 
+       printk("DMI: BIOS: %.40s, %.40s, %.40s\n",
+              dmi_ident[DMI_BIOS_VENDOR], dmi_ident[DMI_BIOS_VERSION],
+              dmi_ident[DMI_BIOS_DATE]);
+       printk("DMI: System: %.40s, %.40s, %.40s\n",
+              dmi_ident[DMI_SYS_VENDOR], dmi_ident[DMI_PRODUCT_NAME],
+              dmi_ident[DMI_PRODUCT_VERSION]); 
+       printk("DMI: Board: %.40s, %.40s, %.40s\n",
+              dmi_ident[DMI_BOARD_VENDOR], dmi_ident[DMI_BOARD_NAME],
+              dmi_ident[DMI_BOARD_VERSION]); 
+ } 
+ 
+ #endif
  /*
   *    Save a DMI string
   */
@@@ -1102,53 -1120,3 +1119,27 @@@ void __init dmi_scan_machine(void
  }
  
  EXPORT_SYMBOL(is_unsafe_smbus);
- 
- 
- #ifdef CONFIG_ACPI_BOOT 
- 
- /* print some information suitable for a blacklist entry. */
- static void dmi_dump_system(void)
- { 
-       printk("DMI: BIOS: %.40s, %.40s, %.40s\n",
-              dmi_ident[DMI_BIOS_VENDOR], dmi_ident[DMI_BIOS_VERSION],
-              dmi_ident[DMI_BIOS_DATE]);
-       printk("DMI: System: %.40s, %.40s, %.40s\n",
-              dmi_ident[DMI_SYS_VENDOR], dmi_ident[DMI_PRODUCT_NAME],
-              dmi_ident[DMI_PRODUCT_VERSION]); 
-       printk("DMI: Board: %.40s, %.40s, %.40s\n",
-              dmi_ident[DMI_BOARD_VENDOR], dmi_ident[DMI_BOARD_NAME],
-              dmi_ident[DMI_BOARD_VERSION]); 
- } 
- 
- 
 +
 +#ifdef CONFIG_MOUNT_ROOT_FAILED_MSG
- }
- #else
- 
- void mount_root_failed_msg(void)
- {
- 
- }
- 
 +/*
 + * mount_root_failed_msg()
 + *
 + * Called from mount_block_root() upon failure to mount root.
 + * architecture dependent to give different platforms
 + * the opportunity to print different handy messages
 + * On x86 this lives here b/c it dumps out some DMI info.
 + */
 +
 +void
 +mount_root_failed_msg(void)
 +{
++#ifdef        CONFIG_ACPI_BOOT
 +      printk ("Try booting with pci=noacpi, acpi=ht, "
 +              "or acpi=off on the command line.\n");
 +      printk ("If one helps, please report the following lines:\n");
 +
 +      dmi_dump_system();
- 
 +#endif
++}
 +#endif        /* CONFIG_MOUNT_ROOT_FAILED_MSG */
 +

diff --cc arch/i386/kernel/setup.c
index f13a8ee9f67b74b2d640fd450ff08152a7f2c9d6,8cb06f26888cde4289730bfdbdcc53e61fda35be..00341dbcc65583e017fd0c9bf1cbc6f35dfbc66e
--- 1/arch/i386/kernel/setup.c
--- 2/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@@ -543,10 -544,13 +544,12 @@@ static void __init parse_cmdline_early 
                        if (!acpi_force) acpi_disabled = 1;
                }
  
+ #ifdef CONFIG_X86_LOCAL_APIC
                /* disable IO-APIC */
 -              else if (!memcmp(from, "noapic", 6)) {
 -                      skip_ioapic_setup = 1;
 -              }
 +              else if (!memcmp(from, "noapic", 6))
 +                      disable_ioapic_setup();
- #endif
+ #endif /* CONFIG_X86_LOCAL_APIC */
+ #endif /* CONFIG_ACPI_BOOT */
  
                /*
                 * highmem=size forces highmem to be exactly 'size' bytes.

diff --cc drivers/base/power/resume.c
index a022a0cdedd5d9cf9a2b06c7cc4cb6ab452e520f,6c86532051287097a7dd1796be77f72c8f4523cf..0f68bf95beac3785422da70a908a1ca89f820466
--- 1/drivers/base/power/resume.c
--- 2/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@@ -80,5 -131,23 +80,22 @@@ void dpm_power_up(void
  void device_pm_power_up(void)
  {
        sysdev_resume();
 -      dpm_power_up_irq();
 -      local_irq_enable();
        dpm_power_up();
  }
+ 
+ /**
+  * device_resume - resume all the devices in the system
+  * @level:    stage of resume process we're at 
+  * 
+  *    This function is deprecated, and should be replaced with appropriate
+  *    calls to device_pm_power_up() and device_pm_resume() above.
+  */
+ 
+ void device_resume(u32 level)
+ {
+ 
+       printk("%s is deprecated. Called from:\n",__FUNCTION__);
+       dump_stack();
+ }
++
+ EXPORT_SYMBOL(device_resume);

diff --cc drivers/base/power/suspend.c
index 5e154218801ee9ed57caa91de271682925ca4b2f,cf1f6c0b7b0e8b522c4c3499a1794be55501d527..78b8e91f1e1a4dee4e8b49506c4bfa3be214d373
--- 1/drivers/base/power/suspend.c
--- 2/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@@ -123,3 -213,23 +123,24 @@@ int device_pm_power_down(u32 state
        dpm_power_up();
        goto Done;
  }
+ 
+ 
+ /**
+  * device_suspend - suspend all devices on the device ree
+  * @state:    state we're entering
+  * @level:    Stage of suspend sequence we're in.
+  *
+  *
+  *    This function is deprecated. Calls should be replaced with
+  *    appropriate calls to device_pm_suspend() and device_pm_power_down().
+  */
+ 
+ int device_suspend(u32 state, u32 level)
+ {
+ 
+       printk("%s Called from:\n",__FUNCTION__);
+       dump_stack();
+       return -EFAULT;
+ }
++
+ EXPORT_SYMBOL(device_suspend);