Commit 7a78a172 authored Oct 29, 2007 by Al Viro Committed by Linus Torvalds Oct 29, 2007

more x86 merge fallout (uml, again)



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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ca5cd877

arch/um/Kconfig.i386

+1 −1

Original line number	Diff line number	Diff line
		menu "Host processor type and features"

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

		endmenu

arch/um/Makefile-i386

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)