From 43d58618a2fb7929b174b4e9e6c7ac105e5a2ed9 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Sun, 28 Oct 2012 15:13:16 +0000
Subject: [PATCH] --- yaml --- r: 346785 b: refs/heads/master c:
 84295dfc5989aaeb6e7d4a9df235451194a54bba h: refs/heads/master i:   346783:
 301f80bb08eda0244fc55614229f56d994b84127 v: v3

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

diff --git a/[refs] b/[refs]
index 6e96616be3fd..5b7e0184cf7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c7a2856ade6a58c20038024247d16a12a8d2323
+refs/heads/master: 84295dfc5989aaeb6e7d4a9df235451194a54bba
diff --git a/trunk/arch/powerpc/kernel/ptrace.c b/trunk/arch/powerpc/kernel/ptrace.c
index 140238aad718..7dd32d17c462 100644
--- a/trunk/arch/powerpc/kernel/ptrace.c
+++ b/trunk/arch/powerpc/kernel/ptrace.c
@@ -1037,7 +1037,7 @@ void ptrace_disable(struct task_struct *child)
 }
 
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
-static long set_intruction_bp(struct task_struct *child,
+static long set_instruction_bp(struct task_struct *child,
 			      struct ppc_hw_breakpoint *bp_info)
 {
 	int slot;
@@ -1371,7 +1371,7 @@ static long ppc_set_hwdebug(struct task_struct *child,
 		if ((bp_info->trigger_type != PPC_BREAKPOINT_TRIGGER_EXECUTE) ||
 		    (bp_info->condition_mode != PPC_BREAKPOINT_CONDITION_NONE))
 			return -EINVAL;
-		return set_intruction_bp(child, bp_info);
+		return set_instruction_bp(child, bp_info);
 	}
 	if (bp_info->addr_mode == PPC_BREAKPOINT_MODE_EXACT)
 		return set_dac(child, bp_info);