Received: by 2002:ac0:a874:0:0:0:0:0 with SMTP id c49csp669732ima; Fri, 15 Mar 2019 11:19:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4JhPujc0xxGAyO3bhMMPNwX67xSXQLbX+etBLUhKvBumKsNVAOppSKlpgUl8JYPCzf6Zv X-Received: by 2002:a63:460a:: with SMTP id t10mr4635936pga.354.1552673980342; Fri, 15 Mar 2019 11:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552673980; cv=none; d=google.com; s=arc-20160816; b=hlvCYHsfH3nopzVQQ0yymNS/a6cHUmOpWjhyZSVcEkUNZ56Pq/i478WvQ0U3Bgebuz anfXo9ukKxxi0jJYCeNiPdbZ8BAeSEsJwWnqj+eJ8Wck5d3hFqMq+i+cluxshnJRTS0H e3YdB6VK8sOWPCK4Dt6PaSNVJzRS/trBcIsKs++/p+1BVMCHIy50cFhhqC9KAJndxn2a tjg4PlQYiivOWCC/WTtkBYFE1R65MIY5MGU1IBN475G/PU1XFAkx2HsimsPCxcyQmv35 m+xmxYRNk1/tX5RpE/+urf2UJIu/3VZIK2trBIa2ZXtJsUSu+GJLuIo1B6TlT6uEp/p0 xFjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=i6dn2k82hEjJ09yo1WFacc2DQUsaS6HINRQbvuUDItE=; b=vKHXjUhIUpuGJ5ixa3XnrWcaXgTeW95QSuCZGDvVsaF0mcSNfgrCrh2SbobvYDnZ8G vRgml0RIk4nvyabl80m6pW7m/bt1wBbGZyPmOEX/Yr1/FfjLZhW3IUg8DZ0yWFivM0wT Js6M3wrYoTqTap1TITjY9NSXzmHx4mSFCTPMs+bCS2jFV5OVQIXMoAarAlXMo+FzyTXr Avuj32w8J72J0tXcsMWch0pilsSjvokO56IlTgeidDx8ry14kB9jR6QL0BDkzI5YRyDp 3hf8moy8QFO531ZbWfT1wfOV9pfjaikoLGVgQxR4jbYlw2uldiCIHFPU8GdBVDOai0R2 NjIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r26si2255413pgv.127.2019.03.15.11.19.25; Fri, 15 Mar 2019 11:19:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726316AbfCOSSs (ORCPT + 99 others); Fri, 15 Mar 2019 14:18:48 -0400 Received: from mail.ahsoftware.de ([88.99.227.106]:50676 "EHLO mail.ahsoftware.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725912AbfCOSSs (ORCPT ); Fri, 15 Mar 2019 14:18:48 -0400 X-Greylist: delayed 407 seconds by postgrey-1.27 at vger.kernel.org; Fri, 15 Mar 2019 14:18:47 EDT Received: by mail.ahsoftware.de (Postfix, from userid 115) id 18FC4101EEB; Fri, 15 Mar 2019 19:11:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.ahsoftware.de X-Spam-Level: X-Spam-Status: No, score=-98.7 required=5.0 tests=RDNS_NONE,USER_IN_WHITELIST autolearn=disabled version=3.4.2 Received: from xu4q.ahsoftware (unknown [IPv6:2a02:810c:280:31aa:6ad4:5651:15f3:92d4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.ahsoftware.de (Postfix) with ESMTPSA id 6A3F4101E7B; Fri, 15 Mar 2019 19:11:57 +0100 (CET) Received: by xu4q.ahsoftware (Postfix, from userid 65534) id 1983483451; Fri, 15 Mar 2019 19:11:57 +0100 (CET) Received: from krabat.ahsoftware (unknown [IPv6:feee::5246:5dff:fe8b:95f8]) by xu4q.ahsoftware (Postfix) with ESMTP id 10AAC83450; Fri, 15 Mar 2019 18:11:54 +0000 (UTC) From: Alexander Holler To: linux-kernel@vger.kernel.org Cc: Alexander Holler , Peter Zijlstra , Thomas Gleixner , stable@vger.kernel.org Subject: [PATCH] perf/x86/intel: fix 2 typos Date: Fri, 15 Mar 2019 19:25:42 +0100 Message-Id: <20190315182542.1700-1-holler@ahsoftware.de> X-Mailer: git-send-email 2.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I don't know if fix is functional correct, but at least it compiles now. It failed before with a config for an AMD CPU. Bug was introduced with commit d01b1f96a82e5dd7841a1d39db3abfdaf95f70ab "perf/x86/intel: Make cpuc allocations consistent" which was merged with 004cc08675b761fd82288bab1b5ba5e1ca746eca. Signed-off-by: Alexander Holler Cc: Peter Zijlstra (Intel) Cc: Thomas Gleixner Cc: --- arch/x86/events/perf_event.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index b04ae6c..a759557 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -1033,12 +1033,12 @@ static inline int intel_pmu_init(void) return 0; } -static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu) +static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu) { return 0; } -static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc) +static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc) { } -- 2.9.5