diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 4a0b375101eb9edcc75a7c4b3af2b6fe7ccd893e..aef7c50f8e1365a6478de2d84471bab6213e1547 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 7dfce37adc8be83424c4463e50a635acfa72650a..e3d62dcbd3565685b110bc9e1f3a76b871a365b3 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