Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "Two small fixlets"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Fix interrupt handler timing harness
  perf/x86/amd: Do not print an error when the device is not present

2 files changed, 3 insertions, 5 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
index 0db655ef3918..639d1289b1ba 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
@@ -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");
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 1db3af933704..1833bc5a84a7 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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;