diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 16:33:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 16:33:37 -0800 |
| commit | 4bde961e5245bb37dab4831107bbed23e433d55a (patch) | |
| tree | 82379a3d40a076d7da82536fcf61921ff258bc48 /arch/um/include/asm/ptrace-generic.h | |
| parent | Merge tag 'metag-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag (diff) | |
| parent | um: Switch clocksource to hrtimers (diff) | |
| download | linux-dev-4bde961e5245bb37dab4831107bbed23e433d55a.tar.xz linux-dev-4bde961e5245bb37dab4831107bbed23e433d55a.zip | |
Merge branch 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- a new hrtimer based clocksource by Anton Ivanov
- ptrace() enhancments by Richard Weinberger
- random cleanups and bug fixes all over the place
* 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Switch clocksource to hrtimers
um: net: replace GFP_KERNEL with GFP_ATOMIC when spinlock is held
um: Report host OOM more nicely
um: Simplify STUB_DATA loading
um: Remove dead symbol from i386 syscall stub
um: Remove dead code from x86_64 syscall stub
um: Get rid of open coded NR_SYSCALLS
um: Store syscall number after syscall_trace_enter()
um: Define PTRACE_OLDSETOPTIONS
Diffstat (limited to 'arch/um/include/asm/ptrace-generic.h')
| -rw-r--r-- | arch/um/include/asm/ptrace-generic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index 2966adbbdf6c..5ab20620fc97 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/arch/um/include/asm/ptrace-generic.h @@ -27,6 +27,8 @@ struct pt_regs { #define instruction_pointer(regs) PT_REGS_IP(regs) +#define PTRACE_OLDSETOPTIONS 21 + struct task_struct; extern long subarch_ptrace(struct task_struct *child, long request, |