Skip to content

Commit

Permalink
more x86 merge fallout (uml, again)
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 29, 2007
1 parent ca5cd87 commit 7a78a17
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/um/Kconfig.i386
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
menu "Host processor type and features"

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

endmenu

Expand Down
2 changes: 1 addition & 1 deletion arch/um/Makefile-i386
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7a78a17

Please sign in to comment.