Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / include / asm-um / linkage.h

diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h
index 27011652b01510f5a17c68a761c7e7ee668a191e..78b862472b363e9bde4c01e43b3f69d81697bd7d 100644 (file)
--- a/include/asm-um/linkage.h
+++ b/include/asm-um/linkage.h
@@ -1,7 +1,13 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
+#ifndef __ASM_UM_LINKAGE_H
+#define __ASM_UM_LINKAGE_H
 
-#define FASTCALL(x)    x __attribute__((regparm(3)))
-#define fastcall        __attribute__((regparm(3)))
+#include "asm/arch/linkage.h"
+
+
+/* <linux/linkage.h> will pick sane defaults */
+#ifdef CONFIG_GPROF
+#undef FASTCALL
+#undef fastcall
+#endif
 
 #endif