From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756055AbcANCvq (ORCPT ); Wed, 13 Jan 2016 21:51:46 -0500 Received: from mail-bl2on0055.outbound.protection.outlook.com ([65.55.169.55]:9296 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755811AbcANCvf (ORCPT ); Wed, 13 Jan 2016 21:51:35 -0500 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O0X99S-08-33J-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Peter Zijlstra , "Ingo Molnar" , Andy Lutomirski , "Thomas Gleixner" , Robert Richter , Jacob Shin , John Stultz , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= CC: , , , Guenter Roeck , Andreas Herrmann , Suravee Suthikulpanit , Aravind Gopalakrishnan , Borislav Petkov , "Fengguang Wu" , Aaron Lu , Huang Rui Subject: [PATCH v2 4/5] perf/x86: Move events_sysfs_show outside CPU_SUP_INTEL Date: Thu, 14 Jan 2016 10:50:07 +0800 Message-ID: <1452739808-11871-5-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452739808-11871-1-git-send-email-ray.huang@amd.com> References: <1452739808-11871-1-git-send-email-ray.huang@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(19580395003)(2906002)(5008740100001)(1096002)(97736004)(189998001)(101416001)(36756003)(5001770100001)(4326007)(77096005)(47776003)(92566002)(5003940100001)(5003600100002)(586003)(11100500001)(76176999)(1220700001)(2950100001)(19580405001)(50986999)(105586002)(53416004)(50466002)(106466001)(87936001)(48376002)(229853001)(50226001)(33646002)(86362001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR12MB0709;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;2:oL3HZTEcurFYpkxyCKQmO9ovjBtpbRgt+JXm3m/2S7pfoVaSRbKL/Vt7kTMG07ho2qKC3UpqNBwNFWwtPDl6TaMzYPW7ttd00hy0QQvGlrF6oj+uoVujNV5AKBPthyFNXXUS3ESFgJGQPnJy7IPMhw==;3:LjQj3r6Lz4U8K27tL7Icv0+FOqdL/gVnak+SjYgPCHJ3K4szL2rDTNS6EmwVO6VmDZFUosaXeZnutLE3BPULmlnLPsKjeXnsLBmI4logcoCji6M9+cOXvSO7YKvcsAjUrL0Y68IYDvmzun+Lpl8vON2mPiqDfgYRV/02BGIiAnL1HMT0Lg0kbScPyePKIM+IRIHeSBNfuvWzAUEfqhP8iN2KMC/U87l/OaC3GKH/wgs=;25:1/JzOhI/mVq3vGk4RyQBIdqsSdslkQDW3xZG/92TVl2EKavsR18E9asbpXWCuoWJYeeyubNGdDtRhMXYszcq4+GLKnp6PBtpAuKgVtV/NkWyH5QEhu6mM8ty1iGWW/4DAj6URqMEh833R89rV0aat/RC5hn6Ek9uJ60xBEJ30BolwSuszJvG2z0PeW/Xd3uvJZypTraZKr+gXuZJnpw1ayh0GUzHcrejtM31nDjb5+Q7K3+k7111vulcnIp1xX2j X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0709; X-MS-Office365-Filtering-Correlation-Id: 78181531-02a6-4215-34bf-08d31c8d9bb4 X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;20:7tjfVMMyGVO5OkfMyuTG7cjwJMzLDC/eGYgS0RL2W7rp8UOGQ2XHucd2CzEi6fEjtp78C3bXA0PsKqLlUIDNCp57wLmxVW8r626YfE6MUPCkz3O1l+kHoj+KnSQ5l9tKGwOUp1Th3pLCZDSj3njFUtXAoZdRmaEtclrpdwpGmDrgM57NGTzgAJkXENxQ0WKR+mhFfpK04FIkct2Ay9/BiV9x79N5x5O774CrmDvR8k3dfUER/p1RBHxBwBEL9JoP5CAJCkDBcVipLtj2jlcDY3Ff/m1/wPB3yZ6X7vAru79DShKrx0712Z0GrVQpC9ledJDKe/r3v6s4V0nVIEcdmvbb7WDjzHR3yNe4+UwkuLZkFgDWhKIbQz2r3ssoM3HI46htRnA1vuSLk7Ub3LiJfqg6efNGzAm7iSqzZ/oVJwFAfU6FWoHPwZYF3+NS6DmhOtCgCuCth25meA70lvhuS+nozhRtahmX9KeKg5psEMYskKLVLdvS6F+oOFwHH/Kn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(13018025)(5005006)(13015025)(13017025)(10201501046)(3002001);SRVR:BY2PR12MB0709;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0709; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;4:Q4AU3OQ5D1GpYmNZEEwmiku5B/T2jgxgVwe9Nn1/gGJx9pVqYtBGAr5rXmEhWeYrNcAttJraq5vZvSWmogayxtf5EFd+gI5UrFPaUdB57gTSNBMOY+vvnmHOskGNRLy+ZHOzu0QSDbEW2w5lp0nePsYdQoKsVnhzWpD7DcYj3DqIQ12PvKEo5pdzZnVaCtlplDzefbdaC+bCsLkOvBUWRWHoR0R6y0vv+mbT1MTTgRYC77NLn/x8ln9/KqB7GB+VArL/XyvyqGaZ2EnlFpU3aqEJlHWz11nHuqueaoPCeVo1ulOdhO6sY9/Bn2VLUTlBgebhzvNBTsQ8lslvbnvxMeQX0yEJwyiA7R/WGH8PbdYDfEgyLtirNfxNkFBvlaSpJKpZGmLehlV610hSxs+WnH+1vAByPF6I3RtPSF0q6n0YYoWNORsxUCIHx942JLDlABU6DXNn976YqYGK74KZFRBb5nUEaFiScDktqa/wzxk= X-Forefront-PRVS: 08213D42D3 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR12MB0709;23:FnnhFQ4QorDmt2BrILU5NE9Bmrt3BbLEgA+HmGxsN?= =?us-ascii?Q?5tczscWPVo2W7Ao/IQlwSQ/2AbqnvBLyW9IALXg7D0ZX3S4GjrmJlb8PAZkS?= =?us-ascii?Q?RwQPPVHHvAzm+3Y4vy9loXzPIDbzBpU/B61UMI+hgtTlafroAD/Guk0q/3aw?= =?us-ascii?Q?YuE5q/3FPMWwU3w0iRzTguAk9gq/fbA0mOLr3LUcJlSRBJ8kUw7LktxlFQqh?= =?us-ascii?Q?H5Nb+wc2Qeu49J972Gmz9IhobeXmZ8T4mqQjdRWvH2JokwJ2/quNXXXWUpcD?= =?us-ascii?Q?fBuaNIcHfovXkoXrJQdEWbJdvhxiqo0xXNXVAdmbh8YIOVX4lk9ldhdI4Xud?= =?us-ascii?Q?+HlGuwBsmVFJbgfRx58h9CVIkCBBS4NkalaKYhKrrsIMF8fagieh6JgHOKEh?= =?us-ascii?Q?PPdBd1dlEFgXzQgf2W7N9OPloBL6k3zYznmHJXfYryGEbZkH6Fnf6euAXHye?= =?us-ascii?Q?vH5vlhAYhHqUqilueJZhlVpM/PW74571uNkSbAHHe7RTQMzH0hkbCDoT13Mj?= =?us-ascii?Q?lLZ7LMCK2q4WJm/qHUZ+1/KYRbMiP9xefVym4FjR5gynJ3tKwCV/NSg4xplJ?= =?us-ascii?Q?j0OtuaIL1iQE9m8XoEwbP5IVy1bfux3OFxAUyA9PcgVsKACpmfHdfUyY1X8m?= =?us-ascii?Q?RYWn0tHSLj2R0HkcszWFX+ZyIff2kR438esqKRm20gthJ9sGUjufHFPnpcU1?= =?us-ascii?Q?qHd8VMkO1/ZUMn24NoK4AeSS1A6OtvZWfnFrmtAfhaoMoEgfNJIEWJfAvqLY?= =?us-ascii?Q?c/lM+T7WUwTWkBQlDgp786nxECDdQrnXp1OsZxY8o76sX4gZCNEpYKr6HHY5?= =?us-ascii?Q?vtlWqP/6cvrNf5pZIaKh6Bt0Aj0j97tzD7KRYA4Z7ycV2ZHhxI3N9n5gVX+x?= =?us-ascii?Q?uW9nPcDUxGVl1VUwI+egNi2AvRAfjn3YTj5m2LU21Jus4QbKlek90WvHwI0V?= =?us-ascii?Q?Hlhi2yIZsqWzB0yXfY1zpeMg5raKe4NdxjGPL/H1rIzBOOPknM/21hjh3Z0e?= =?us-ascii?Q?tmzxld687gwLP2GF2OPcZgo?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;5:MZv1Iwmsr3uEu8Ry3+Ei+CjOxUmPg9GvFsLmSDTrIObqxtFaeCd1VrtjZgv+w6woXNNmVvOJeXLIREWI9/AAx97cyKRiK85uDaunDmn8XkbgcNoX/1A3/mHwz+UiixqPlu16VMjxw2u/l5gbXq7WwQ==;24:R2wpIaqEM2Dthvu+CMHiwv79S7bkswzTYKHJGrE3BwMall+86rZEGAX7VVclpOnT/hvdVJaGocplIWRx/F1r0P4gbd5QiDKdQg0mKOgHgyM=;20:JhroQcjO28gIVdIj7p2jFVYEexawY+TGdfmA/EZni0B2CQ0H+Zb6mnCzw+jyN65Vni4cSv3K24oGxjxONH9n8nHPmxF84sz+HQwiBaiqbZ7g+akJ92RJ3zvTf5hkknVoVPw+YwLvxG66UvnP0pXByIrNRtLDNM+g1BZaHCtJl2qiA2lQZeW4cpeUMhDvAEElPVPnouJRlm3393N7D7ly2RqPAftUmlESm8wZYaXws6fxRyWqpEuWtDXh8DEKsg9i SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2016 02:51:29.8241 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0709 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch moves events_sysfs_show outside CONFIG_CPU_SUP_INTEL, because this interface will be also used on AMD power reporting performance event. Otherwise, below build error would be encountered: All error/warnings (new ones prefixed by >>): In file included from include/linux/kobject.h:21:0, from include/linux/module.h:17, from arch/x86/kernel/cpu/perf_event_amd_power.c:13: >> arch/x86/kernel/cpu/perf_event.h:663:31: error: 'events_sysfs_show' undeclared here (not in a function) .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \ ^ include/linux/sysfs.h:103:10: note: in definition of macro '__ATTR' .show = _show, \ ^ >> arch/x86/kernel/cpu/perf_event_amd_power.c:244:1: note: in expansion of macro 'EVENT_ATTR_STR' EVENT_ATTR_STR(power-pkg, power_pkg, "event=0x01"); ^ Reported-by: build test robot Signed-off-by: Huang Rui --- arch/x86/kernel/cpu/perf_event.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index 799e6bd..986f6ba 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h @@ -793,6 +793,9 @@ ssize_t intel_event_sysfs_show(char *page, u64 config); struct attribute **merge_attr(struct attribute **a, struct attribute **b); +ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, + char *page); + #ifdef CONFIG_CPU_SUP_AMD int amd_pmu_init(void); @@ -917,9 +920,6 @@ int p6_pmu_init(void); int knc_pmu_init(void); -ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, - char *page); - static inline int is_ht_workaround_enabled(void) { return !!(x86_pmu.flags & PMU_FL_EXCL_ENABLED); -- 1.9.1