diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:09:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:09:59 +0800 |
| commit | 7b8892bba12eba95f3e1615dfeb8ad77e3b0371a (patch) | |
| tree | 70b4cc1f7003724e722f9fcbd0956e7920c2e854 /arch/arm64/kernel/traps.c | |
| parent | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (diff) | |
| parent | efab1adba28d9ebbfa86808375fc085c4e84e746 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlinux-linaro-lsk-v4.1-android
Diffstat (limited to 'arch/arm64/kernel/traps.c')
| -rw-r--r-- | arch/arm64/kernel/traps.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 1ef2940df13c..0a7bc087838e 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -179,11 +179,7 @@ void show_stack(struct task_struct *tsk, unsigned long *sp) #else #define S_PREEMPT "" #endif -#ifdef CONFIG_SMP #define S_SMP " SMP" -#else -#define S_SMP "" -#endif static int __die(const char *str, int err, struct thread_info *thread, struct pt_regs *regs) |