From: Bodo Stroesser <bstroesser@fujitsu-siemens.com>

This patch replaces the contents of include/asm-um/linkage.h
by
    #include "asm/arch/linkage.h" 

Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-um/linkage.h |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff -puN include/asm-um/linkage.h~uml-s390-preparation-linkageh-inherited-from-host include/asm-um/linkage.h
--- 25/include/asm-um/linkage.h~uml-s390-preparation-linkageh-inherited-from-host	Mon May  2 17:15:45 2005
+++ 25-akpm/include/asm-um/linkage.h	Mon May  2 17:15:45 2005
@@ -1,7 +1,6 @@
-#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"
 
 #endif
_