diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-21 17:35:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-21 17:35:46 +0100 |
| commit | d8e72f6b168e8f91d2fae7902c7c43eae9c4c880 (patch) | |
| tree | 3819ad9ac5caa55fbcec63418bafa39ff2682bc8 /arch/arm64/include/asm/ptrace.h | |
| parent | 49c72bffd230ecee5f69afc0a83d9bd2617ea9eb (diff) | |
| parent | 9da2fb2070585c138ccd041f0c4f9e72886312e6 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into linux-linaro-lsk
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/debug-monitors.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/debug-monitors.c
Diffstat (limited to 'arch/arm64/include/asm/ptrace.h')
| -rw-r--r-- | arch/arm64/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 0e7fa4963735..5233966fba3d 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -164,7 +164,7 @@ static inline int valid_user_regs(struct user_pt_regs *regs) return 0; } -#define instruction_pointer(regs) (regs)->pc +#define instruction_pointer(regs) ((unsigned long)(regs)->pc) #ifdef CONFIG_SMP extern unsigned long profile_pc(struct pt_regs *regs); |