From 5a4dcb3de7454ac4e371235a56e21b41639bb9fc Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 15 Nov 2011 14:48:58 -0800
Subject: [PATCH] --- yaml --- r: 277470 b: refs/heads/master c:
 98b8b99ae1233a5408b136544e900a9cfb46e08f h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/ptrace.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 911bca7d2880..8e3a44a4c9cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cced40229993bb63238299e48a22e4c8d1e13181
+refs/heads/master: 98b8b99ae1233a5408b136544e900a9cfb46e08f
diff --git a/trunk/arch/x86/kernel/ptrace.c b/trunk/arch/x86/kernel/ptrace.c
index 82528799c5de..89a04c7b5bb6 100644
--- a/trunk/arch/x86/kernel/ptrace.c
+++ b/trunk/arch/x86/kernel/ptrace.c
@@ -749,7 +749,8 @@ static int ptrace_set_breakpoint_addr(struct task_struct *tsk, int nr,
 /*
  * Handle PTRACE_POKEUSR calls for the debug register area.
  */
-int ptrace_set_debugreg(struct task_struct *tsk, int n, unsigned long val)
+static int ptrace_set_debugreg(struct task_struct *tsk, int n,
+			       unsigned long val)
 {
 	struct thread_struct *thread = &(tsk->thread);
 	int rc = 0;