aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-09 09:03:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-09 09:03:46 -0700
commit20e029d791b22000c45ac7ce5a09e8dee8a3d323 (patch)
tree8761f88c4b8399ab0041cedf54526364e3844d97 /arch/x86
parente5c832d5558826cc6e9a24746cfdec8e7780063a (diff)
parent81bab4c38ad59b35d1bea2a96ce6bc90570b1392 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger: "This pile contains mostly fixes and improvements for issues identified by Richard W M Jones while adding UML as backend to libguestfs" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Add irq chip um/mask handlers um: prctl: Do not include linux/ptrace.h um: Run UML in it's own session. um: Cleanup SIGTERM handling um: ubd: Introduce submit_request() um: ubd: Add REQ_FLUSH suppport um: Implement probe_kernel_read() um: hostfs: Fix writeback
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/um/os-Linux/prctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/os-Linux/prctl.c b/arch/x86/um/os-Linux/prctl.c
index 9d34eddb517..96eb2bd2883 100644
--- a/arch/x86/um/os-Linux/prctl.c
+++ b/arch/x86/um/os-Linux/prctl.c
@@ -4,7 +4,7 @@
*/
#include <sys/ptrace.h>
-#include <linux/ptrace.h>
+#include <asm/ptrace.h>
int os_arch_prctl(int pid, int code, unsigned long *addr)
{