diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-20 10:07:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-20 10:07:12 +0200 |
| commit | afa7a17f3aafb64647ba4cd38e20f3d678c7949b (patch) | |
| tree | 7cc16805d61da9670a96e17c25307a4a4972fe67 /arch/um/include/shared/os.h | |
| parent | Merge tag 'perf-core-for-mingo-4.12-20170413' of git://git.kernel.org/pub/scm... (diff) | |
| parent | x86/arch_prctl: Add ARCH_[GET|SET]_CPUID (diff) | |
| download | linux-afa7a17f3aafb64647ba4cd38e20f3d678c7949b.tar.gz linux-afa7a17f3aafb64647ba4cd38e20f3d678c7949b.zip | |
Merge branch 'WIP.x86/process' into perf/core
Diffstat (limited to 'arch/um/include/shared/os.h')
| -rw-r--r-- | arch/um/include/shared/os.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index de5d572225f3..cd1fa97776c3 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h @@ -302,8 +302,8 @@ extern int ignore_sigio_fd(int fd); extern void maybe_sigio_broken(int fd, int read); extern void sigio_broken(int fd, int read); -/* sys-x86_64/prctl.c */ -extern int os_arch_prctl(int pid, int code, unsigned long *addr); +/* prctl.c */ +extern int os_arch_prctl(int pid, int option, unsigned long *arg2); /* tty.c */ extern int get_pty(void); |