* [PATCH] more x86 merge fallout (uml, again)
@ 2007-10-29 4:34 Al Viro
2007-10-29 16:31 ` Jeff Dike
0 siblings, 1 reply; 2+ messages in thread
From: Al Viro @ 2007-10-29 4:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: jdike, linux-kernel
arch/i386/{Kconfig,Makefile}.cpu got moved
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] more x86 merge fallout (uml, again)
2007-10-29 4:34 [PATCH] more x86 merge fallout (uml, again) Al Viro
@ 2007-10-29 16:31 ` Jeff Dike
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Dike @ 2007-10-29 16:31 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, jdike, linux-kernel
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 <viro@zeniv.linux.org.uk>
Acked-by: Jeff Dike <jdike@linux.intel.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-29 16:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-29 4:34 [PATCH] more x86 merge fallout (uml, again) Al Viro
2007-10-29 16:31 ` Jeff Dike
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox