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/time.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/time.c')
| -rw-r--r-- | arch/arm64/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index 42f9195cf2f8..149151fb42bb 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -42,7 +42,6 @@ #include <asm/thread_info.h> #include <asm/stacktrace.h> -#ifdef CONFIG_SMP unsigned long profile_pc(struct pt_regs *regs) { struct stackframe frame; @@ -62,7 +61,6 @@ unsigned long profile_pc(struct pt_regs *regs) return frame.pc; } EXPORT_SYMBOL(profile_pc); -#endif void __init time_init(void) { |