2007-10-29 04:34:42

by Al Viro

Subject: [PATCH] more x86 merge fallout (uml, again)

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

Signed-off-by: Al Viro <[email protected]>
---
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 9876d80..e0ac74e 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -1,6 +1,6 @@
menu "Host processor type and features"

-source "arch/i386/Kconfig.cpu"
+source "arch/x86/Kconfig.cpu"

endmenu

diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 08433f8..b01dfb0 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -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)

2007-10-29 16:31:37

by Jeff Dike

Subject: Re: [PATCH] more x86 merge fallout (uml, again)

On Mon, Oct 29, 2007 at 04:34:31AM +0000, Al Viro wrote:
> arch/i386/{Kconfig,Makefile}.cpu got moved
>
> Signed-off-by: Al Viro <[email protected]>

Acked-by: Jeff Dike <[email protected]>