diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-02-07 16:28:22 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-02-22 00:04:10 +0100 |
| commit | 13a5045d4ee5a244195062cbf2c651d1b4f22aa7 (patch) | |
| tree | 56c48e3304976258298b52c2ab95288f7e0ffd58 /arch/arm/kernel/entry-common.S | |
| parent | Linux 3.3-rc3 (diff) | |
| download | linux-13a5045d4ee5a244195062cbf2c651d1b4f22aa7.tar.xz linux-13a5045d4ee5a244195062cbf2c651d1b4f22aa7.zip | |
ARM: make arch_ret_to_user macro optional
Only 3 platforms need arch_ret_to_user macro, so add ARCH_HAS_RET_TO_USER
kconfig option and make iop13xx, iop32x and iop33x select it.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 9fd0ba90c1d2..54ee265dd819 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -10,9 +10,15 @@ #include <asm/unistd.h> #include <asm/ftrace.h> -#include <mach/entry-macro.S> #include <asm/unwind.h> +#ifdef CONFIG_NEED_RET_TO_USER +#include <mach/entry-macro.S> +#else + .macro arch_ret_to_user, tmp1, tmp2 + .endm +#endif + #include "entry-header.S" |