From 7604870c7dffc83b86768861c1a26e32c15b4d43 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Sun, 30 Oct 2005 15:00:08 -0800 Subject: [PATCH] --- yaml --- r: 11794 b: refs/heads/master c: 6a351cfeadd4b56a2a0031020c0cfb07cc0337fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/Makefile-i386 | 4 ---- trunk/include/asm-um/linkage.h | 8 ++++++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 66609ca20222..8e487379dde9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b365157be3250a6b5948422ba65e05e5f964e150 +refs/heads/master: 6a351cfeadd4b56a2a0031020c0cfb07cc0337fb diff --git a/trunk/arch/um/Makefile-i386 b/trunk/arch/um/Makefile-i386 index 4a0b375101eb..aef7c50f8e13 100644 --- a/trunk/arch/um/Makefile-i386 +++ b/trunk/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/trunk/include/asm-um/linkage.h b/trunk/include/asm-um/linkage.h index 7dfce37adc8b..e3d62dcbd356 100644 --- a/trunk/include/asm-um/linkage.h +++ b/trunk/include/asm-um/linkage.h @@ -3,4 +3,12 @@ #include "asm/arch/linkage.h" +#include + +/* will pick sane defaults */ +#ifdef CONFIG_GPROF +#undef FASTCALL +#undef fastcall +#endif + #endif