Browse Source

[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>
Paolo 'Blaisorblade' Giarrusso 19 years ago
parent
commit
6a351cfead
2 changed files with 8 additions and 4 deletions
  1. 0 4
      arch/um/Makefile-i386
  2. 8 0
      include/asm-um/linkage.h

+ 0 - 4
arch/um/Makefile-i386

@@ -29,10 +29,6 @@ endif
 
 
 CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
 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.
 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
 include $(srctree)/arch/i386/Makefile.cpu
 include $(srctree)/arch/i386/Makefile.cpu
 
 

+ 8 - 0
include/asm-um/linkage.h

@@ -3,4 +3,12 @@
 
 
 #include "asm/arch/linkage.h"
 #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
 #endif