From e18b79a9deabc986c5c179ac6542ef0a7d415b52 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jan 2012 19:26:11 -0800
Subject: [PATCH] --- yaml --- r: 286537 b: refs/heads/master c:
 90a4c0f51e8e44111a926be6f4c87af3938a79c3 h: refs/heads/master i:   286535:
 d01ade202a20aba6ad141bf5dfc7417a0241a00d 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 b53fe844fe68..f787cf4a6933 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f59e842fc0871cd5baa213dc32e0ce8e5aaf4758
+refs/heads/master: 90a4c0f51e8e44111a926be6f4c87af3938a79c3
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 */