From 301e31310ecbfb7fa6522ff223630510b710c92c Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Tue, 15 Dec 2009 16:47:17 -0800
Subject: [PATCH] --- yaml --- r: 176679 b: refs/heads/master c:
 85ec7fd9f8e528c4f61d595cfe4df7681a19f252 h: refs/heads/master i:   176677:
 ad0ee393d7e8e2b9195c5449fa89e8b23a8dfddf   176675:
 21689844f9c5e1664952bc011d2e91aece7b60d5   176671:
 b161af8fc1f8ded3c5f0deb9d304f7f43a208a6b v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/ptrace.h | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f5701e9b3d47..db837018f0a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6580807da14c423f0d0a708108e6df6ebc8bc83d
+refs/heads/master: 85ec7fd9f8e528c4f61d595cfe4df7681a19f252
diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h
index 1951805df63a..56f2d63a5cbb 100644
--- a/trunk/include/linux/ptrace.h
+++ b/trunk/include/linux/ptrace.h
@@ -273,6 +273,18 @@ static inline void user_enable_block_step(struct task_struct *task)
 }
 #endif	/* arch_has_block_step */
 
+#ifdef ARCH_HAS_USER_SINGLE_STEP_INFO
+extern void user_single_step_siginfo(struct task_struct *tsk,
+				struct pt_regs *regs, siginfo_t *info);
+#else
+static inline void user_single_step_siginfo(struct task_struct *tsk,
+				struct pt_regs *regs, siginfo_t *info)
+{
+	memset(info, 0, sizeof(*info));
+	info->si_signo = SIGTRAP;
+}
+#endif
+
 #ifndef arch_ptrace_stop_needed
 /**
  * arch_ptrace_stop_needed - Decide whether arch_ptrace_stop() should be called