2 files changed, 5 insertions, 5 deletions

diff --git a/samples/Kconfig b/samples/Kconfig
index e4be84ac3d38..8924f72f0629 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -1,5 +1,3 @@
-# samples/Kconfig
-
 menuconfig SAMPLES
         bool "Sample kernel code"
         help
@@ -47,4 +45,3 @@ config SAMPLE_HW_BREAKPOINT
           This builds kernel hardware breakpoint example modules.
 
 endif # SAMPLES
-
diff --git a/samples/hw_breakpoint/data_breakpoint.c b/samples/hw_breakpoint/data_breakpoint.c
index 29525500df00..c69cbe9b2426 100644
--- a/samples/hw_breakpoint/data_breakpoint.c
+++ b/samples/hw_breakpoint/data_breakpoint.c
@@ -41,7 +41,9 @@ module_param_string(ksym, ksym_name, KSYM_NAME_LEN, S_IRUGO);
 MODULE_PARM_DESC(ksym, "Kernel symbol to monitor; this module will report any"
                         " write operations on the kernel symbol");
 
-static void sample_hbp_handler(struct perf_event *temp, void *data)
+static void sample_hbp_handler(struct perf_event *bp, int nmi,
+                               struct perf_sample_data *data,
+                               struct pt_regs *regs)
 {
         printk(KERN_INFO "%s value is changed\n", ksym_name);
         dump_stack();
@@ -51,8 +53,9 @@ static void sample_hbp_handler(struct perf_event *temp, void *data)
 static int __init hw_break_module_init(void)
 {
         int ret;
-        DEFINE_BREAKPOINT_ATTR(attr);
+        struct perf_event_attr attr;
 
+        hw_breakpoint_init(&attr);
         attr.bp_addr = kallsyms_lookup_name(ksym_name);
         attr.bp_len = HW_BREAKPOINT_LEN_4;
         attr.bp_type = HW_BREAKPOINT_W | HW_BREAKPOINT_R;