diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
| commit | efab1adba28d9ebbfa86808375fc085c4e84e746 (patch) | |
| tree | c82080ef077c5ea9e50a8308404c599710d6301f /arch/arm64/kernel/traps.c | |
| parent | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (diff) | |
| parent | eb7d99ea962fa62f487246462a2777ac918c8895 (diff) | |
Merge remote-tracking branch 'v4.1/topic/PSCI' into linux-linaro-lsk-v4.1lsk-v4.1-16.01
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) |