diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 10:15:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 10:15:24 -0400 |
| commit | 4175160b065e74572819a320dcd34129224a4e1c (patch) | |
| tree | 3298e2c9a7c7db33bf28617875e5429e17eec61c /arch/arm/include/asm/ptrace.h | |
| parent | ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd (diff) | |
| parent | 0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e (diff) | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/kernel/ptrace.c
Diffstat (limited to 'arch/arm/include/asm/ptrace.h')
| -rw-r--r-- | arch/arm/include/asm/ptrace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index 451808ba1211..355ece523f41 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h | |||
| @@ -249,6 +249,11 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) | |||
| 249 | return regs->ARM_sp; | 249 | return regs->ARM_sp; |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | static inline unsigned long user_stack_pointer(struct pt_regs *regs) | ||
| 253 | { | ||
| 254 | return regs->ARM_sp; | ||
| 255 | } | ||
| 256 | |||
| 252 | #endif /* __KERNEL__ */ | 257 | #endif /* __KERNEL__ */ |
| 253 | 258 | ||
| 254 | #endif /* __ASSEMBLY__ */ | 259 | #endif /* __ASSEMBLY__ */ |