diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-10-31 00:00:08 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 02:37:16 +0100 |
| commit | 6a351cfeadd4b56a2a0031020c0cfb07cc0337fb (patch) | |
| tree | 88b96f069f035a73cc6089a141a0167e4cb6afe8 | |
| parent | [PATCH] uml: fix "reuse i386 cpu optimizations" (diff) | |
| download | linux-6a351cfeadd4b56a2a0031020c0cfb07cc0337fb.tar.xz linux-6a351cfeadd4b56a2a0031020c0cfb07cc0337fb.zip | |
[PATCH] uml: remove old UM_FASTCALL, and make the thing work again
This was used in the old dark age of 2.4, ARCH_CFLAGS doesn't work any more
since some time, and UM_FASTCALL was never used in 2.6.
Instead, reintroduce the thing more properly now, directly in
include/asm-um/linkage.h.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/Makefile-i386 | 4 | ||||
| -rw-r--r-- | include/asm-um/linkage.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 4a0b375101eb..aef7c50f8e13 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 @@ -29,10 +29,6 @@ endif CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) -ifneq ($(CONFIG_GPROF),y) -ARCH_CFLAGS += -DUM_FASTCALL -endif - # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. include $(srctree)/arch/i386/Makefile.cpu diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h index 7dfce37adc8b..e3d62dcbd356 100644 --- a/include/asm-um/linkage.h +++ b/include/asm-um/linkage.h @@ -3,4 +3,12 @@ #include "asm/arch/linkage.h" +#include <linux/config.h> + +/* <linux/linkage.h> will pick sane defaults */ +#ifdef CONFIG_GPROF +#undef FASTCALL +#undef fastcall +#endif + #endif |