Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.

1 files changed, 1 insertions, 3 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");