diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/arm/kernel/entry-common.S | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
| -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 @@ | |||
| 10 | 10 | ||
| 11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
| 12 | #include <asm/ftrace.h> | 12 | #include <asm/ftrace.h> |
| 13 | #include <mach/entry-macro.S> | ||
| 14 | #include <asm/unwind.h> | 13 | #include <asm/unwind.h> |
| 15 | 14 | ||
| 15 | #ifdef CONFIG_NEED_RET_TO_USER | ||
| 16 | #include <mach/entry-macro.S> | ||
| 17 | #else | ||
| 18 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 19 | .endm | ||
| 20 | #endif | ||
| 21 | |||
| 16 | #include "entry-header.S" | 22 | #include "entry-header.S" |
| 17 | 23 | ||
| 18 | 24 | ||