---

yaml --- r: 79934 b: refs/heads/master c: 82f74e7 h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · 47cc774 · 47cc774
1 parent 11a9618
commit 47cc774
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git 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
@@ -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
diff --git a/trunk/include/asm-x86/linkage_64.h b/trunk/include/asm-x86/linkage_64.h