diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 00:34:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:41:32 -0400 |
| commit | 7a78a1722380dd3cb5a009dbcd007f92b6b87743 (patch) | |
| tree | 87d1f54d566ddd0428f92095572d72a680faa989 /arch | |
| parent | ca5cd877ae699e758e6f26efc11b01bf6631d427 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Kconfig.i386 | 2 | ||||
| -rw-r--r-- | arch/um/Makefile-i386 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386 index 9876d80d85dd..e0ac74e5d4c4 100644 --- a/arch/um/Kconfig.i386 +++ b/arch/um/Kconfig.i386 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | menu "Host processor type and features" | 1 | menu "Host processor type and features" |
| 2 | 2 | ||
| 3 | source "arch/i386/Kconfig.cpu" | 3 | source "arch/x86/Kconfig.cpu" |
| 4 | 4 | ||
| 5 | endmenu | 5 | endmenu |
| 6 | 6 | ||
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 08433f85189c..b01dfb00e5f8 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 | |||
| @@ -28,7 +28,7 @@ CONFIG_X86_32 := y | |||
| 28 | export CONFIG_X86_32 | 28 | export CONFIG_X86_32 |
| 29 | 29 | ||
| 30 | # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. | 30 | # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. |
| 31 | include $(srctree)/arch/i386/Makefile.cpu | 31 | include $(srctree)/arch/x86/Makefile_32.cpu |
| 32 | 32 | ||
| 33 | # prevent gcc from keeping the stack 16 byte aligned. Taken from i386. | 33 | # prevent gcc from keeping the stack 16 byte aligned. Taken from i386. |
| 34 | cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) | 34 | cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) |