diff options
| author | Macpaul Lin <macpaul@andestech.com> | 2011-12-01 12:32:10 +0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-02-12 15:03:26 -0500 |
| commit | 273d11eae5cbd124ea64df99d14678b4d3694961 (patch) | |
| tree | c32829025a596b3c4278a4aa83e0cc6f064cfcb0 /arch | |
| parent | 051a5f30f16739c11f762a7ae0c26ae95f26d62e (diff) | |
| download | u-boot-imx-273d11eae5cbd124ea64df99d14678b4d3694961.zip u-boot-imx-273d11eae5cbd124ea64df99d14678b4d3694961.tar.gz u-boot-imx-273d11eae5cbd124ea64df99d14678b4d3694961.tar.bz2 | |
linkage.h: move from blackfin to common includes
1. Add linkage.h support from blackfin to common include,
which is a reduced version from Linux.
2. Add architecture part support of linkage.h into blackfin
3. Fix include path of in blackfin related to linkage.h
due to header file movement.
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/cpu/cache.S | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/blackfin_local.h | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cache.h | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/linkage.h | 50 | ||||
| -rw-r--r-- | arch/blackfin/lib/__kgdb.S | 2 | ||||
| -rw-r--r-- | arch/blackfin/lib/outs.S | 2 |
6 files changed, 7 insertions, 53 deletions
diff --git a/arch/blackfin/cpu/cache.S b/arch/blackfin/cpu/cache.S index 6ed655a..5ca9e91 100644 --- a/arch/blackfin/cpu/cache.S +++ b/arch/blackfin/cpu/cache.S @@ -8,8 +8,8 @@ * Licensed under the GPL-2 or later. */ -#include <asm/linkage.h> #include <config.h> +#include <linux/linkage.h> #include <asm/blackfin.h> .text diff --git a/arch/blackfin/include/asm/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h index 71207b6..49d0c9e 100644 --- a/arch/blackfin/include/asm/blackfin_local.h +++ b/arch/blackfin/include/asm/blackfin_local.h @@ -48,7 +48,7 @@ #define L1_CACHE_SHIFT 5 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) -#include <asm/linkage.h> +#include <linux/linkage.h> #include <asm/cache.h> #ifndef __ASSEMBLY__ diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h index 482e4b5..568885a 100644 --- a/arch/blackfin/include/asm/cache.h +++ b/arch/blackfin/include/asm/cache.h @@ -7,7 +7,7 @@ #ifndef __ARCH_BLACKFIN_CACHE_H #define __ARCH_BLACKFIN_CACHE_H -#include <asm/linkage.h> /* for asmlinkage */ +#include <linux/linkage.h> /* for asmlinkage */ /* * Bytes per L1 cache line diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h index fbb497c..6d4493a 100644 --- a/arch/blackfin/include/asm/linkage.h +++ b/arch/blackfin/include/asm/linkage.h @@ -22,53 +22,7 @@ * MA 02110-1301 USA */ -#ifndef _LINUX_LINKAGE_H -#define _LINUX_LINKAGE_H - -#include <linux/config.h> - -#ifdef __cplusplus -#define CPP_ASMLINKAGE extern "C" -#else -#define CPP_ASMLINKAGE -#endif - -#define asmlinkage CPP_ASMLINKAGE - -#define SYMBOL_NAME_STR(X) #X -#define SYMBOL_NAME(X) X -#ifdef __STDC__ -#define SYMBOL_NAME_LABEL(X) X##: -#else -#define SYMBOL_NAME_LABEL(X) X: -#endif - -#define __ALIGN .align 4 -#define __ALIGN_STR ".align 4" - -#ifdef __ASSEMBLY__ - -#define ALIGN __ALIGN -#define ALIGN_STR __ALIGN_STR - -#define LENTRY(name) \ - ALIGN; \ - SYMBOL_NAME_LABEL(name) - -#define ENTRY(name) \ - .globl SYMBOL_NAME(name); \ - LENTRY(name) -#endif - -#ifndef END -#define END(name) \ - .size name, .-name -#endif - -#ifndef ENDPROC -#define ENDPROC(name) \ - .type name, @function; \ - END(name) -#endif +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H #endif diff --git a/arch/blackfin/lib/__kgdb.S b/arch/blackfin/lib/__kgdb.S index cba4179..4ccde8f 100644 --- a/arch/blackfin/lib/__kgdb.S +++ b/arch/blackfin/lib/__kgdb.S @@ -1,5 +1,5 @@ -#include <asm/linkage.h> +#include <linux/linkage.h> /* save stack context for non-local goto * int kgdb_setjmp(long *buf) diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 253d4c3..39d5332 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S @@ -8,7 +8,7 @@ * Licensed under the GPL-2. */ -#include <asm/linkage.h> +#include <linux/linkage.h> .align 2 |