diff --git a/[refs] b/[refs]
index 369b3440b60b..242da332c9d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7c25802b39c443b3745cfa973dc49a97a3491f8
+refs/heads/master: d425de5436a620de506f9e4119bf8daa1cb93718
diff --git a/trunk/arch/x86/oprofile/op_model_amd.c b/trunk/arch/x86/oprofile/op_model_amd.c
index 7d90d47655ba..a011bcc0f943 100644
--- a/trunk/arch/x86/oprofile/op_model_amd.c
+++ b/trunk/arch/x86/oprofile/op_model_amd.c
@@ -630,29 +630,21 @@ static int __init_ibs_nmi(void)
 	return 0;
 }
 
-/*
- * check and reserve APIC extended interrupt LVT offset for IBS if
- * available
- *
- * init_ibs() preforms implicitly cpu-local operations, so pin this
- * thread to its current CPU
- */
-
+/* initialize the APIC for the IBS interrupts if available */
 static void init_ibs(void)
 {
-	preempt_disable();
-
 	ibs_caps = get_ibs_caps();
+
 	if (!ibs_caps)
-		goto out;
+		return;
 
-	if (__init_ibs_nmi() < 0)
+	if (__init_ibs_nmi()) {
 		ibs_caps = 0;
-	else
-		printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);
+		return;
+	}
 
-out:
-	preempt_enable();
+	printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n",
+	       (unsigned)ibs_caps);
 }
 
 static int (*create_arch_files)(struct super_block *sb, struct dentry *root);
diff --git a/trunk/tools/perf/util/hist.c b/trunk/tools/perf/util/hist.c
index 2022e8740994..76bcc35cf9b1 100644
--- a/trunk/tools/perf/util/hist.c
+++ b/trunk/tools/perf/util/hist.c
@@ -356,7 +356,7 @@ static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
 
 static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain,
 				     int depth, int depth_mask, int period,
-				     u64 total_samples, int hits,
+				     u64 total_samples, u64 hits,
 				     int left_margin)
 {
 	int i;