From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 04:11:26 +0000 (-0400)
Subject: Merge branch 'linus' into sfi-release
X-Git-Tag: v2.6.32-rc1~170^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c602c65b2f81d14456771d1e3f15d1381f4b7efa;p=linux.git

Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

c602c65b2f81d14456771d1e3f15d1381f4b7efa
diff --cc arch/x86/kernel/setup.c
index d784ea207606,a55f6609fe1f..6c7886890fa6
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -990,10 -984,7 +985,9 @@@ void __init setup_arch(char **cmdline_p
  	 * Read APIC and some other early information from ACPI tables.
  	 */
  	acpi_boot_init();
 +
 +	sfi_init();
  
- #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
  	/*
  	 * get boot-time SMP configuration:
  	 */
diff --cc drivers/acpi/power.c
index e86603f37dee,5a09bf392ec1..22b297916519
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@@ -43,9 -43,9 +43,10 @@@
  #include <linux/seq_file.h>
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
 -
+ #include "sleep.h"
  
 +#define PREFIX "ACPI: "
 +
  #define _COMPONENT			ACPI_POWER_COMPONENT
  ACPI_MODULE_NAME("power");
  #define ACPI_POWER_CLASS		"power_resource"
diff --cc drivers/pci/dmar.c
index 998f02d2ba42,ab99783dccec..47aa5938fb04
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -33,8 -33,10 +33,9 @@@
  #include <linux/timer.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>
+ #include <linux/tboot.h>
  
 -#undef PREFIX
 -#define PREFIX "DMAR:"
 +#define PREFIX "DMAR: "
  
  /* No locks are needed as DMA remapping hardware unit
   * list is constructed at boot time and hotplug of
diff --cc init/main.c
index 9f110fbf0c45,34971becbd3c..a2086913a17b
--- a/init/main.c
+++ b/init/main.c
@@@ -68,7 -68,7 +68,8 @@@
  #include <linux/async.h>
  #include <linux/kmemcheck.h>
  #include <linux/kmemtrace.h>
 +#include <linux/sfi.h>
+ #include <linux/shmem_fs.h>
  #include <trace/boot.h>
  
  #include <asm/io.h>