From: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Date: Thu, 5 May 2005 23:15:36 +0000 (-0700)
Subject: [PATCH] uml: s390 preparation, linkage.h inherited from host
X-Git-Tag: v2.6.12-rc4~82
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c52ac046757deebc514483e407dca39a9c774aa3;p=linux-2.6-omap-h63xx.git

[PATCH] uml: s390 preparation, linkage.h inherited from host

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h
index 27011652b01..7dfce37adc8 100644
--- a/include/asm-um/linkage.h
+++ b/include/asm-um/linkage.h
@@ -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