diff options
| author | Aneesh V <aneesh@ti.com> | 2012-03-08 07:20:17 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-05-15 08:31:26 +0200 |
| commit | 7245536d19aaf0a6dc1c2d4a8fa80adf2f2ae739 (patch) | |
| tree | a6c73c9320f558ccc5352970629286981d0d8ccd | |
| parent | 0696473be705287eb728356c79af19b69b60ab09 (diff) | |
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>
| -rw-r--r-- | arch/arm/include/asm/linkage.h | 7 | ||||
| -rw-r--r-- | include/linux/linkage.h | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/include/asm/linkage.h b/arch/arm/include/asm/linkage.h new file mode 100644 index 00000000000..dbe4b4e31a5 --- /dev/null +++ b/arch/arm/include/asm/linkage.h @@ -0,0 +1,7 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 0 +#define __ALIGN_STR ".align 0" + +#endif diff --git a/include/linux/linkage.h b/include/linux/linkage.h index ed4cf6cbcd5..7b749bbda70 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 |