diff --git a/[refs] b/[refs]
index 176b7ace5eb9..d84391637689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76b0f1337690d223811c852ad3a5078eb89276c5
+refs/heads/master: d09ec7387184eba9e3030496f0451204090ff610
diff --git a/trunk/arch/powerpc/include/asm/hw_breakpoint.h b/trunk/arch/powerpc/include/asm/hw_breakpoint.h
index ea87f8ae7bdb..1c33ec17ca36 100644
--- a/trunk/arch/powerpc/include/asm/hw_breakpoint.h
+++ b/trunk/arch/powerpc/include/asm/hw_breakpoint.h
@@ -37,10 +37,6 @@ struct arch_hw_breakpoint {
 #include <asm/reg.h>
 #include <asm/system.h>
 
-static inline int hw_breakpoint_slots(int type)
-{
-	return HBP_NUM;
-}
 struct perf_event;
 struct pmu;
 struct perf_sample_data;
@@ -49,6 +45,7 @@ struct perf_sample_data;
 /* Maximum permissible length of any HW Breakpoint */
 #define HW_BREAKPOINT_LEN 0x8
 
+extern int hw_breakpoint_slots(int type);
 extern int arch_bp_generic_fields(int type, int *gen_bp_type);
 extern int arch_check_bp_in_kernelspace(struct perf_event *bp);
 extern int arch_validate_hwbkpt_settings(struct perf_event *bp);
diff --git a/trunk/arch/powerpc/kernel/hw_breakpoint.c b/trunk/arch/powerpc/kernel/hw_breakpoint.c
index 5a1d55d06a08..5ecd0401cdb1 100644
--- a/trunk/arch/powerpc/kernel/hw_breakpoint.c
+++ b/trunk/arch/powerpc/kernel/hw_breakpoint.c
@@ -43,6 +43,16 @@
  */
 static DEFINE_PER_CPU(struct perf_event *, bp_per_reg);
 
+/*
+ * Returns total number of data or instruction breakpoints available.
+ */
+int hw_breakpoint_slots(int type)
+{
+	if (type == TYPE_DATA)
+		return HBP_NUM;
+	return 0;		/* no instruction breakpoints available */
+}
+
 /*
  * Install a perf counter breakpoint.
  *