Skip to contentSkip to conversation

perf fixes

GIT PULL Ingo Molnar 1 participant 1 message Jul 10, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest perf-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus

HEAD: e5302920da9ef23f9d19d4e9ac85704cc25bee7a perf: Fix interrupt handler timing harness

Two small fixlets.

Thanks,

Ingo

------------------>
Peter Zijlstra (1):
perf/x86/amd: Do not print an error when the device is not present

Stephane Eranian (1):
perf: Fix interrupt handler timing harness

 arch/x86/kernel/cpu/perf_event_amd_iommu.c | 4 +---
 kernel/events/core.c                       | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/perf_event_amd_iommu.c +1 -3
index 0db655e..639d128 100644
@@ -491,10 +491,8 @@ static struct perf_amd_iommu __perf_iommu = {
 static __init int amd_iommu_pc_init(void)
 {
 	/* Make sure the IOMMU PC resource is available */
-	if (!amd_iommu_pc_supported()) {
-		pr_err("perf: amd_iommu PMU not installed. No support!\n");
+	if (!amd_iommu_pc_supported())
 		return -ENODEV;
-	}
 
 	_init_perf_amd_iommu(&__perf_iommu, "amd_iommu");
 
kernel/events/core.c +2 -2
index 1db3af9..1833bc5 100644
@@ -182,7 +182,7 @@ void update_perf_cpu_limits(void)
 	u64 tmp = perf_sample_period_ns;
 
 	tmp *= sysctl_perf_cpu_time_max_percent;
-	tmp = do_div(tmp, 100);
+	do_div(tmp, 100);
 	atomic_set(&perf_sample_allowed_ns, tmp);
 }
 
@@ -232,7 +232,7 @@ DEFINE_PER_CPU(u64, running_sample_length);
 void perf_sample_event_took(u64 sample_len_ns)
 {
 	u64 avg_local_sample_len;
-	u64 local_samples_len = __get_cpu_var(running_sample_length);
+	u64 local_samples_len;
 
 	if (atomic_read(&perf_sample_allowed_ns) == 0)
 		return;