summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-03-23 08:28:19 +0100
committerIngo Molnar <mingo@kernel.org>2017-03-23 08:28:19 +0100
commit1f9ca184049724209cddbddac593d13eb87e48c0 (patch)
treea96bfd7bad95b717d2cabfd1e00e8803e998c23d /arch/um
parentb23adb7d3f7d1d7cce03db9704de67a99ceeda38 (diff)
parentd582799fe5de1c1ca127d7f364db12a660cf46d4 (diff)
downloadlinux-stable-1f9ca184049724209cddbddac593d13eb87e48c0.tar.gz
linux-stable-1f9ca184049724209cddbddac593d13eb87e48c0.tar.bz2
linux-stable-1f9ca184049724209cddbddac593d13eb87e48c0.zip
Merge branch 'x86/process' into x86/mm, to create new base for further patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/shared/os.h4
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);