From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 21 Dec 2009 06:56:24 +0000 (+0900)
Subject: sh: Fix up hw-breakpoints build for API changes.
X-Git-Tag: v2.6.34-rc1~285^2~136^3~10
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=a28b460ec7968f430a2d6ea2809b249ee9fe1d28;p=safe%2Fjmp%2Flinux-2.6

sh: Fix up hw-breakpoints build for API changes.

The event callback handling has been removed in favour of going through a
generic event handler to handle overflows. Follows the x86 change.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/kernel/hw_breakpoint.c b/arch/sh/kernel/hw_breakpoint.c
index ff3cb3d..75b8c47 100644
--- a/arch/sh/kernel/hw_breakpoint.c
+++ b/arch/sh/kernel/hw_breakpoint.c
@@ -302,8 +302,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp,
 		return ret;
 	}
 
-	if (bp->callback)
-		ret = arch_store_info(bp);
+	ret = arch_store_info(bp);
 
 	if (ret < 0)
 		return ret;
@@ -368,7 +367,7 @@ static int __kprobes hw_breakpoint_handler(struct die_args *args)
 			break;
 		}
 
-		(bp->callback)(bp, args->regs);
+		perf_bp_event(bp, args->regs);
 
 		rcu_read_unlock();
 	}