[U-Boot] [PATCH 1/6] arm: adapt asm/linkage.h from Linux

Aneesh V
2012-03-08T17:14:38Z

Missed adding 'v4' in the subject. Please ignore this series. Will
re-send correcting the subject.

On Thursday 08 March 2012 10:40 PM, Aneesh V wrote:
> This will add ARM specific over-rides for the defines
> from linux/linkage.h
>
> Signed-off-by: Aneesh V<aneesh@ti.com>
> ---
> Not adding the defines for __ALIGN and __ALIGN_STR
> because it's not clear why alignment is set to 0
> (single byte alignment).
>
> Creates a checkpatch error that can not be avoided
>
> Changes in v4:
> - Use STT_FUNC in the definition of ENDPROC in
> include/linux/linkage.h that is more portable
> than the '*function' versions. Now, remove the
> definition of ENDPROC from the arm linkage.h
>
> Changes in v3:
> - None
>
> Changes in v2:
> - Newly added
> ---
> arch/arm/include/asm/linkage.h | 7 +++++++
> include/linux/linkage.h | 7 ++++++-
> 2 files changed, 13 insertions(+), 1 deletions(-)
> create mode 100644 arch/arm/include/asm/linkage.h
>
> diff --git a/arch/arm/include/asm/linkage.h b/arch/arm/include/asm/linkage.h
> new file mode 100644
> index 0000000..dbe4b4e
> --- /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 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
>