diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-12-03 08:36:57 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-12-15 14:22:53 (GMT) |
| commit | e6126a58720ed8e53de93883c3f1572ad3d7b7c3 (patch) | |
| tree | e57c32b0d9f8f0a738458f84c0ddb22a682cf67c /include | |
| parent | ba7b38a5295d9bad1a95f53f0a3ade20441a3831 (diff) | |
| download | u-boot-fsl-qoriq-e6126a58720ed8e53de93883c3f1572ad3d7b7c3.tar.xz | |
x86: move arch-specific asmlinkage to <asm/linkage.h>
Commit 65dd74a674d6 (x86: ivybridge: Implement SDRAM init) introduced
x86-specific asmlinkage into arch/x86/include/asm/config.h.
Commit ed0a2fbf14f7 (x86: Add a definition of asmlinkage) added the
same macro define again, this time, into include/common.h.
(Please do not add arch-specific stuff to include/common.h any more;
it is already too cluttered.)
The generic asmlinkage is defined in <linux/linkage.h>. If you want
to override it with an arch-specific one, the best way is to add it
to <asm/linkage.h> like Linux Kernel.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/linux/linkage.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index 46f07fe..4f2f303 100644 --- a/include/common.h +++ b/include/common.h @@ -73,9 +73,6 @@ typedef volatile unsigned char vu_char; #ifdef CONFIG_ARM #define asmlinkage /* nothing */ #endif -#ifdef CONFIG_X86 -#define asmlinkage __attribute__((regparm(0))) -#endif #ifdef CONFIG_BLACKFIN #include <asm/blackfin.h> #endif diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 7435fcd..5797498 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -17,7 +17,9 @@ #define CPP_ASMLINKAGE #endif +#ifndef asmlinkage #define asmlinkage CPP_ASMLINKAGE +#endif #define SYMBOL_NAME_STR(X) #X #define SYMBOL_NAME(X) X |