summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAneesh V <aneesh@ti.com>2012-03-08 07:20:17 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-05-15 08:31:26 +0200
commit7245536d19aaf0a6dc1c2d4a8fa80adf2f2ae739 (patch)
treea6c73c9320f558ccc5352970629286981d0d8ccd /include/linux
parent0696473be705287eb728356c79af19b69b60ab09 (diff)
downloadu-boot-imx-7245536d19aaf0a6dc1c2d4a8fa80adf2f2ae739.zip
u-boot-imx-7245536d19aaf0a6dc1c2d4a8fa80adf2f2ae739.tar.gz
u-boot-imx-7245536d19aaf0a6dc1c2d4a8fa80adf2f2ae739.tar.bz2
arm: adapt asm/linkage.h from Linux
This will add ARM specific over-rides for the defines from linux/linkage.h Signed-off-by: Aneesh V <aneesh@ti.com> Tested-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/linkage.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index ed4cf6c..7b749bb 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -44,8 +44,13 @@
#define SYMBOL_NAME_LABEL(X) X:
#endif
+#ifndef __ALIGN
#define __ALIGN .align 4
+#endif
+
+#ifndef __ALIGN_STR
#define __ALIGN_STR ".align 4"
+#endif
#ifdef __ASSEMBLY__
@@ -67,7 +72,7 @@
#ifndef ENDPROC
#define ENDPROC(name) \
- .type name, @function; \
+ .type name STT_FUNC; \
END(name)
#endif