Skip to contentSkip to conversation

more x86 merge fallout (uml, again)

PATCH In review Al Viro 2 participants 2 messages Oct 29, 2007 User-mode Linux (UML)

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 more x86 merge fallout (uml, again)

arch/i386/{Kconfig,Makefile}.cpu got moved

Signed-off-by Al Viro <[email protected]>

---

arch/um/Kconfig.i386 +1 -1
index 9876d80..e0ac74e 100644
@@ -1,6 +1,6 @@
 menu "Host processor type and features"
 
-source "arch/i386/Kconfig.cpu"
+source "arch/x86/Kconfig.cpu"
 
 endmenu
arch/um/Makefile-i386 +1 -1
index 08433f8..b01dfb0 100644
@@ -28,7 +28,7 @@ CONFIG_X86_32		:= y
 export CONFIG_X86_32
 
 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
-include $(srctree)/arch/i386/Makefile.cpu
+include $(srctree)/arch/x86/Makefile_32.cpu
 
 # prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
 cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)