From 6d0addd02178cb46a98564412c612544f46f68b6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jan 2012 11:46:08 -0800
Subject: [PATCH] --- yaml --- r: 286542 b: refs/heads/master c:
 afd290945cd283030b51b433a66fe57a8feb28c8 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/um/shared/sysdep/ptrace.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 78de1212ae14..52f5fbc25ac0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 456a8167e94b66f406c27400a46a707b870452b0
+refs/heads/master: afd290945cd283030b51b433a66fe57a8feb28c8
diff --git a/trunk/arch/x86/um/shared/sysdep/ptrace.h b/trunk/arch/x86/um/shared/sysdep/ptrace.h
index 5ef9344a8b24..2bbe1ec2d96a 100644
--- a/trunk/arch/x86/um/shared/sysdep/ptrace.h
+++ b/trunk/arch/x86/um/shared/sysdep/ptrace.h
@@ -1,3 +1,6 @@
+#ifndef __SYSDEP_X86_PTRACE_H
+#define __SYSDEP_X86_PTRACE_H
+
 #ifdef __i386__
 #include "ptrace_32.h"
 #else
@@ -8,3 +11,5 @@ static inline long regs_return_value(struct uml_pt_regs *regs)
 {
 	return UPT_SYSCALL_RET(regs);
 }
+
+#endif /* __SYSDEP_X86_PTRACE_H */