From 1a2baaf71987be6d5823024cc3379288254ffded Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 12 Jul 2011 17:49:29 +0100
Subject: [PATCH] --- yaml --- r: 257427 b: refs/heads/master c:
 43605ef188cd39708ddc5e3adc47b337b6ebe40e h: refs/heads/master i:   257425:
 f348e5b711d3d66ace64014d1157f1c5f6ae1c3d   257423:
 47fe7f89cfd25942b288a1cbfce2d2787e24e485 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/x86/Kconfig                     | 15 +++++++++++++--
 trunk/arch/x86/kernel/relocate_kernel_32.S |  2 --
 trunk/arch/x86/kernel/relocate_kernel_64.S |  2 --
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 832d332562a8..c3017a3efc45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 050438ed5a05b25cdf287f5691e56a58c2606997
+refs/heads/master: 43605ef188cd39708ddc5e3adc47b337b6ebe40e
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 37357a599dca..80ef4196d3bf 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -384,12 +384,21 @@ config X86_INTEL_CE
 	  This option compiles in support for the CE4100 SOC for settop
 	  boxes and media devices.
 
+config X86_INTEL_MID
+	bool "Intel MID platform support"
+	depends on X86_32
+	depends on X86_EXTENDED_PLATFORM
+	---help---
+	  Select to build a kernel capable of supporting Intel MID platform
+	  systems which do not have the PCI legacy interfaces (Moorestown,
+	  Medfield). If you are building for a PC class system say N here.
+
+if X86_INTEL_MID
+
 config X86_MRST
        bool "Moorestown MID platform"
 	depends on PCI
 	depends on PCI_GOANY
-	depends on X86_32
-	depends on X86_EXTENDED_PLATFORM
 	depends on X86_IO_APIC
 	select APB_TIMER
 	select I2C
@@ -404,6 +413,8 @@ config X86_MRST
 	  nor standard legacy replacement devices/features. e.g. Moorestown does
 	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
 
+endif
+
 config X86_RDC321X
 	bool "RDC R-321x SoC"
 	depends on X86_32
diff --git a/trunk/arch/x86/kernel/relocate_kernel_32.S b/trunk/arch/x86/kernel/relocate_kernel_32.S
index 36818f8ec2be..41235531b11c 100644
--- a/trunk/arch/x86/kernel/relocate_kernel_32.S
+++ b/trunk/arch/x86/kernel/relocate_kernel_32.S
@@ -97,8 +97,6 @@ relocate_kernel:
 	ret
 
 identity_mapped:
-	/* set return address to 0 if not preserving context */
-	pushl	$0
 	/* store the start address on the stack */
 	pushl   %edx
 
diff --git a/trunk/arch/x86/kernel/relocate_kernel_64.S b/trunk/arch/x86/kernel/relocate_kernel_64.S
index 7a6f3b3be3cf..4de8f5b3d476 100644
--- a/trunk/arch/x86/kernel/relocate_kernel_64.S
+++ b/trunk/arch/x86/kernel/relocate_kernel_64.S
@@ -100,8 +100,6 @@ relocate_kernel:
 	ret
 
 identity_mapped:
-	/* set return address to 0 if not preserving context */
-	pushq	$0
 	/* store the start address on the stack */
 	pushq   %rdx