From 6d5cf7370af5ae0fc43665257dbdef1e789612e6 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <Marc.Zyngier@arm.com>
Date: Fri, 19 Oct 2012 17:33:27 +0100
Subject: [PATCH] --- yaml --- r: 334674 b: refs/heads/master c:
 aeed41a9371ee02257b608eb06a9058507a7d0f4 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm64/include/asm/Kbuild    | 1 -
 trunk/arch/arm64/include/asm/linkage.h | 7 +++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/arm64/include/asm/linkage.h

diff --git a/[refs] b/[refs]
index 3dc3dce9eb7f..dd24350126f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f34a1da35aed7b438a2de8ac27723a5472e8399
+refs/heads/master: aeed41a9371ee02257b608eb06a9058507a7d0f4
diff --git a/trunk/arch/arm64/include/asm/Kbuild b/trunk/arch/arm64/include/asm/Kbuild
index fe77e51a7847..a581a2205938 100644
--- a/trunk/arch/arm64/include/asm/Kbuild
+++ b/trunk/arch/arm64/include/asm/Kbuild
@@ -18,7 +18,6 @@ generic-y += ipcbuf.h
 generic-y += irq_regs.h
 generic-y += kdebug.h
 generic-y += kmap_types.h
-generic-y += linkage.h
 generic-y += local.h
 generic-y += local64.h
 generic-y += mman.h
diff --git a/trunk/arch/arm64/include/asm/linkage.h b/trunk/arch/arm64/include/asm/linkage.h
new file mode 100644
index 000000000000..636c1bced7d4
--- /dev/null
+++ b/trunk/arch/arm64/include/asm/linkage.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+#define __ALIGN		.align 4
+#define __ALIGN_STR	".align 4"
+
+#endif