From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026AbcCYDS7 (ORCPT ); Thu, 24 Mar 2016 23:18:59 -0400 Received: from mail-bl2on0094.outbound.protection.outlook.com ([65.55.169.94]:61330 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750797AbcCYDS5 (ORCPT ); Thu, 24 Mar 2016 23:18:57 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; 01.org; dkim=none (message not signed) header.d=none;01.org; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O4KRVE-07-G1Y-02 X-M-MSG: From: Huang Rui To: Peter Zijlstra , Ingo Molnar , Randy Dunlap , Stephen Rothwell , , Borislav Petkov CC: , , , , , "Borislav Petkov" , Sherry Hurwitz , Fengguang Wu , Huang Rui Subject: [REDO PATCH] x86/perf: Move events_sysfs_show() outside CPU_SUP_INTEL Date: Fri, 25 Mar 2016 11:18:25 +0800 Message-ID: <1458875905-4278-1-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(164054003)(106466001)(15975445007)(105586002)(86362001)(33646002)(77096005)(189998001)(19580395003)(1220700001)(48376002)(1096002)(586003)(5003600100002)(5001770100001)(81166005)(87936001)(5003940100001)(19580405001)(50466002)(53416004)(47776003)(101416001)(92566002)(50986999)(2906002)(4326007)(36756003)(50226001)(11100500001)(229853001)(5008740100001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0862;H:atltwp01.amd.com;FPR:;SPF:None;MLV:sfv;A:1;MX:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: 8d8acdd6-7bab-40ac-003b-08d3545c3164 X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;2:ObtuOWc7q8SGA/AmuKfvcHGwS5myByz0nvFSdtbrxhdk1zx78z4YHsrNnnh1I+6IspcRi7ptYuUSZE2dn9jNTtF0VEY7D10r1BDy9TXRezvikUg2Pm5SymL7jKk5KTDvEXs4+348dsuXl9u4PyuIOh9WqNaaGgZbuOJtkR1T0DZXqmb4WoFjPIgYIhc9D8zG;3:f9xIZSjkRhQCPKYSUS3B258BjStYb2iX233pHSAOiZxs6PAtRC2Kv2hWcG6szIxE6UL2JHMl7I0UnNr+IngodplRVvoJhLLHo0kY+qw4WWi086JzbI7o/QnNd61/h+WxfhpaqitDoKc0fgw52RR5cBS5yiwFDorTpWRfcecKPDuVwmjckR5k87A7jf9fyarF8CwXEx/jPSjJCU7rFWoMJMxpXd8RFxFO7GONBhM8Wno= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0862; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;25:h1DpoXuz2qKvv/1MIoWGMix16Ao+uOWIKesq6QvKX06kU0ZaOtpU+LntY2oKV1CH+ttNjMB/wfdqGeS+zwi6s/HMsiNamCFnTI2sZ2ZH09MEywcGcKHsf28Aa3mQhblKdGS2sk6f/o1bfnXqEEqXMx+r4HuYkZYoAx9OkKYBLpjNipbNk/jmNZlFgqk+ZcpNWgF5p2FXot9oqbrUW6SkV5SeS7AqhOBaXoViyN54l98RD0p9+GlQ75bJIDkKe7whBUXVFrIz8NV9Zgjw6be2atCWMn1Wt/p5REna/PlEUBNI7Kg5/2x/Kr4PcJ+YDX/PQmZ89aLUXF6cufHvO6qVKWwurbEzUWgbHgcujzQ0qVZkGhG+uD1tA6NC1WMIooTPpwP1xJVLmA9PTP2QthXgKYEFVXFkDRZuiItKfCa3JQAcAAKD2DcCV0CJ4o+C6prkxn4uxBFGCol2Bz+Xd93BowM8WejAgy/jcAfm3TcEEoAKUO3QfomvqtEATLW4jIkSeAncDNULlWSzEcA0SYba/iX3DoUKsMBVehNOGp4jebZIowxBGNOmejBF0Gi+Ye/aY8QoaHSzm9RWdDa6EQwoCbcmM6OnSYVU7CJvU+2I1cGSa5Eel0+WybSmNdsf/NJKfxiFXUnLKykdD6B2r05n0trsZg0BEt9JABqiXfRLlCh1oloGpuHdjjLEzeov7ALMBA7mmIfELPDaTfiZ/RzInQ== X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;20:BQo0kHvCiuSlnOs+HOHbzzy/La3MJdoO40z6BsIBtCl5gLCmwhAgd2/gkUlTQs4a//VqXbUDI1K21QUTYrkXLe6tI7Klg8X6+boPuHKfkDnAmMnezFQ4Wh0w3JPwpSEi4nQMNOImMGGd3M5HZOQFN6G9lLQYp4Yls+7m8Bgupbpt0yBueSkhMmvoEu8YxZOynDtJ+zfpL+ZtmSQikQLrrZEzh2PkN7RLSp7ptM144vW94W6U0zd5QaoeeSY5r/9e3ZkA97ffopE1Ade4jm+d7/hvki3OOfj3+vEqMwJtbSlMpQpHn3OEQjAwmbDpfZQxm65ikWeE9KhfKZig5wBbGsGIEHtOUCYLJ/lphI4eZfK1s0Gkie+c2SgrrisKH7xgR4jUY0jAEyknRHIfZ5Eyo+qX86yOqocrb9X+US9O03FLCdBaXx3drmLh3R3vxJdGqTlHwPNgiC7KMR3sGlm3ruM6sFSqEtGiAaYwEWbYdZHZeWN6yb6g0NVIdLcycfop X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(13023025)(13024025)(13015025)(13018025)(5005006)(13017025)(3002001)(10201501046);SRVR:SN1PR12MB0862;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0862; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;4:EemorQUb8N+tBY7KhPgbcuFVSSdHIUNR9xnZ1MY7emOAnVgmReWUAd0wQP0xqDh9Kf1e7laF+0YZZCRVd+EWsN/1Yk4+OoXu3ES6gNM1XDgQqOTxfon/xzlURDikv+RkCaoKpJw/4gtMRoRZRk/HFGrn1MuWrwS/bEBA7Ls6NV35wfclhD2AM4C8HbPhtyXWk971An6vVsI6GQBi6SxoOd4VDTQLGvV5t61t2Udnwud9O5YvC/y8ebLeGIHGTnxaUJ9iFngZhSrVy9XIXsK/7NsUy5MMHpR5WN+qVJB1GsPLIq9A0QvAeFsTeE+ZKbxRDF0+oXOBujZ5BiNeH+/aNIlNo4z3Jg1ljwgr56s0ms4/GQfwF9TJ7NQxP844lYjJMASw+TxPvi5TTnjTphuz8oLoIQxUkqmR9JJi/ZRADHdDNCgJ6UFuyxO9dTdWgDc8wRVseCP9omR80ny0iuX1/g== X-Forefront-PRVS: 0892FA9A88 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0862;23:kpH48TgcCjOWHnIoTJpFql0NYQtDIbokXE0wWf48b?= =?us-ascii?Q?/+TDcNLcUGWaMxePAcaw3CYBGXCLT9ObT/C0EKwzGMywH5LUMFOosDrkC5kd?= =?us-ascii?Q?dJa+QydMkwLjVsRwUWoVB41Aljd3vTua2mUUKIQYIBwKDjADtgXZV4N/bO/C?= =?us-ascii?Q?AcJeITjQoYiWMslkiCwc+HlgLbwwqpdt7LAb0ru2NWOso3OwkpCNrMpLFjhp?= =?us-ascii?Q?2r/jcZnSDjSrFk218rP411wWHr92OyadzyAS7IcHiY1cp43xccJBPwa5ckp+?= =?us-ascii?Q?TGjS3q9UjQD5kPeZPYwG+vq/loHyGjohznDuGd+uznUzKNnoP6BgD7vrfUrj?= =?us-ascii?Q?0blRrBl1lP43PKCtw3290bPG/ZkmqrsStrYfA20FbR/Zm/AYN+Ika/3XtONf?= =?us-ascii?Q?N8HAW0rVzqYcvjKVc4K1O9374cZfbV/VicYFthV17dxNk37+LcHMuD4YAt6+?= =?us-ascii?Q?yZ44YkM+qtZW/hGFvOnAU7h9+ZY8wCrmQQX8lGZ/+UDazvT6OswJbZSjW1V5?= =?us-ascii?Q?BkelrV69G7szb61UW0e4IXX1FcqfRcM3dDqxw60oLgLal0K7ghk2PN1n2axl?= =?us-ascii?Q?Tf6msFSmar03z3Osx74ZIW0eGTbr5W/MzSH+tu5+4Lhs0Z2YGI3quBrzQODG?= =?us-ascii?Q?UXsVKDBPQYLzLGVAyfU9jQJX/uPC+ydUlDBUOWd/zfzDXX5N0aUsdbTZCm50?= =?us-ascii?Q?Z3wMWPSgn+1RQtzl4/sNkxHRrFTopzi16ChMJoy3t+w8q0TaeTt5NlptidL/?= =?us-ascii?Q?MsXfrmrJKTeVb2wtDj91QC2zO6WE4c8ooMwT/cVdtJQ5dQW7RFvRc7PszOKw?= =?us-ascii?Q?HPDAl4551LeTgYV6e7CTO61wrHNT8LxZK5r9cWM7sxpowziK6gpFiQYXqDCU?= =?us-ascii?Q?YRyqijnWsHvT1WL+8afT7ixY6PxJdlPMnZMRVaGJAdgrQUYa1LijZKjbbfYK?= =?us-ascii?Q?UC4s6cy6rweFlzTQXWdqEBzP1NSfQTr5FazoOkLgoun4A0xsB7Mf74vAzuly?= =?us-ascii?Q?Hegyk54tmnjif1KnsNi0PuC?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;5:ouwJoMB3v4L6kYZRdDj7tLTOpaVmfi2HjOK0Q+k1rG3M0aVi7a0VdLWPA364r78UvgQG892Duj1jeWae2oUZ2U0/k8Wgi54BeseZ2XD1W6LIVf6BcBDr4d0kEuVjXr3XkWWJzFHF3QSPdPKVOJqxbA==;24:n2/F0rkVHFgVVwP8iah1QuRWBDiZfTgTKlWVEadWmwrqlsrGPzR765uo4Xo/zdERKbyZDmUEaEUcuQGsAqrl3fmXNe/rNKoZ4Dy63L3LKiY=;20:erDeZ0FQ3J8BYeCZtaauoQ7R1QdOSTw++tkav2rN4zWAuj8xBd40L1nGPlCKNhaYaP8cgBiykoAL8LDXHxr0gWYdX1A3vyo+XFShtpBwN7kShx+5YoZjDHEi5O2h3PJd7eUzwOk7VyZvTAlbFrbzk7M5XP8aV5TtJUExZVqpGrcZeNkhys8B7l6sT3n6/2g5WQO331pAVU5T4UGB0AUCZINchfkp5v/vHcTCGhHc2Vzbb6SgcjZGvRDBVaBbb+Ha SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2016 03:18:52.3295 (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.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0862 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 in an AMD power reporting PMU driver. 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: Randy Dunlap Reported-by: build test robot Signed-off-by: Huang Rui Cc: Stephen Rothwell Cc: acme@kernel.org --- Hi Peter, Ingo, Randy, According to the comments of below thread, I rebased this fix to latest kernel. http://lkml.kernel.org/r/56F41E3F.8000407@infradead.org Orignal patch: https://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/commit/?h=tip-perf&id=f5ba42d22cb478d32363b2b8e92e14b1fd190ce1 Thanks, Rui --- arch/x86/events/perf_event.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index ba6ef18..a6771e2 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -795,6 +795,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); @@ -925,9 +928,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