---

yaml --- r: 11794 b: refs/heads/master c: 6a351cf h: refs/heads/master v: v3
git-mirror · Oct 31, 2005 · 7604870 · 7604870
1 parent e1b32f9
commit 7604870
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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