From 47cc774a240c1db0a69512032c5813da204a270a Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Jan 2008 13:31:07 +0100
Subject: [PATCH] --- yaml --- r: 79934 b: refs/heads/master c:
 82f74e7159749cc511ebf5954a7b9ea6ad634949 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-x86/linkage.h    | 21 ++++++++++++++++++---
 trunk/include/asm-x86/linkage_32.h | 15 ---------------
 trunk/include/asm-x86/linkage_64.h |  6 ------
 4 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 trunk/include/asm-x86/linkage_32.h
 delete mode 100644 trunk/include/asm-x86/linkage_64.h

diff --git a/[refs] b/[refs]
index a5f5e224caa0..0313bf6b5654 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c210d24986dc19e387c10508c0bc2faadadc1a2e
+refs/heads/master: 82f74e7159749cc511ebf5954a7b9ea6ad634949
diff --git a/trunk/include/asm-x86/linkage.h b/trunk/include/asm-x86/linkage.h
index 94b257fa8701..5a4c95905420 100644
--- a/trunk/include/asm-x86/linkage.h
+++ b/trunk/include/asm-x86/linkage.h
@@ -1,5 +1,20 @@
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+#ifdef CONFIG_X86_64
+#define __ALIGN .p2align 4,,15
+#define __ALIGN_STR ".p2align 4,,15"
+#endif
+
 #ifdef CONFIG_X86_32
-# include "linkage_32.h"
-#else
-# include "linkage_64.h"
+#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
+#define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret))
+#endif
+
+#ifdef CONFIG_X86_ALIGNMENT_16
+#define __ALIGN .align 16,0x90
+#define __ALIGN_STR ".align 16,0x90"
+#endif
+
 #endif
+
diff --git a/trunk/include/asm-x86/linkage_32.h b/trunk/include/asm-x86/linkage_32.h
deleted file mode 100644
index f4a6ebac0247..000000000000
--- a/trunk/include/asm-x86/linkage_32.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-
-#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
-#define FASTCALL(x)	x __attribute__((regparm(3)))
-#define fastcall	__attribute__((regparm(3)))
-
-#define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret))
-
-#ifdef CONFIG_X86_ALIGNMENT_16
-#define __ALIGN .align 16,0x90
-#define __ALIGN_STR ".align 16,0x90"
-#endif
-
-#endif
diff --git a/trunk/include/asm-x86/linkage_64.h b/trunk/include/asm-x86/linkage_64.h
deleted file mode 100644
index b5f39d0189ce..000000000000
--- a/trunk/include/asm-x86/linkage_64.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-
-#define __ALIGN .p2align 4,,15
-
-#endif