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/include/asm/ptrace.h | |
parent | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (diff) | |
parent | efab1adba28d9ebbfa86808375fc085c4e84e746 (diff) |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.01-android
Diffstat (limited to 'arch/arm64/include/asm/ptrace.h')
-rw-r--r-- | arch/arm64/include/asm/ptrace.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index d4264bb0a409..e9e5467e0bf4 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -183,11 +183,7 @@ static inline int valid_user_regs(struct user_pt_regs *regs) #define instruction_pointer(regs) ((unsigned long)(regs)->pc) -#ifdef CONFIG_SMP extern unsigned long profile_pc(struct pt_regs *regs); -#else -#define profile_pc(regs) instruction_pointer(regs) -#endif #endif /* __ASSEMBLY__ */ #endif |