From patchwork Tue Nov 3 19:46:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 7546591 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 142D29F2F7 for ; Tue, 3 Nov 2015 19:49:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D405206F1 for ; Tue, 3 Nov 2015 19:49:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 145E6206D5 for ; Tue, 3 Nov 2015 19:49:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932517AbbKCTtP (ORCPT ); Tue, 3 Nov 2015 14:49:15 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36622 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932523AbbKCTq5 (ORCPT ); Tue, 3 Nov 2015 14:46:57 -0500 Received: by pacdm15 with SMTP id dm15so2822072pac.3 for ; Tue, 03 Nov 2015 11:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt_com.20150623.gappssmtp.com; s=20150623; h=from:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:subject :date:message-id:in-reply-to:references; bh=uS6Kfgp+SKiiQiDXFuPx4rA+WBaajo3AeAcVUDHr2i0=; b=eIANtkKlg22fbBJMuyvCkqWTTZdrkur/VTRTcZrMIBiXqDv+zKT1ky/2LrEENRGb9I 3bat5l3Fix38wNG6KRwiARtGWVFFyPD2TbyUOb/dWBmra4DA8kWR0FRZzRJeOEGAg1IZ AAxniAhMIqb09Ruga7wh0rTyYvOMxouXvzhPXWXfPwXaurMISyd9hFD8vAmcB4A77yKN O+5qfsfKYIjfz2hGp0tZRTSmGWvWEkg4CH04fbAFy0tn+wIFADzl0gqa7YUBsfqDEHn7 O4C6hZbQvgfHSL29geVcxOcRr2adHpfCYOJ69n5TlijsPYchirI+oyUR70qOn5ajt8Uk FzwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:subject:date:message-id:in-reply-to:references; bh=uS6Kfgp+SKiiQiDXFuPx4rA+WBaajo3AeAcVUDHr2i0=; b=hp3G8V91o6XbTm1G3AP8zMBT4RFs+SuEn+bntPRYW/YUb2aR9UPGP7DWoqL6V770e9 TtSiKzOPkIPtIb24xwhvjH1syfPLyfW6bg5LPQGu680bU9cB13uqFYddu4bcY3mPduZx QuFB8kMqhFvGSBh+ZYmN7UpinIDHywC5juKfQgVtCWOkoVBOjd8W0EPPSpL2PPOwQh3+ O923QmDkSvZ+zBG/NYFJ8x00uNmBMKkpNk8QwnNv2z+O7jtIPc9DhdLd3aeXwj7foSSV AHMAkhfo84TIaD3pK1CZYC+VhY8ohOUAIFlyxGOmECiSsVOXBrLJpWo8yfTvWZWIdNI0 U1NA== X-Gm-Message-State: ALoCoQmoKvbN/Ta4+yGGK473C18wDRWwqZDd+may1vNM0tn4lDbt9WPO+shZAyBQxhVkzGkutxfV X-Received: by 10.67.3.66 with SMTP id bu2mr10359252pad.70.1446580017223; Tue, 03 Nov 2015 11:46:57 -0800 (PST) Received: from localhost (dhcp-39-103.EECS.Berkeley.EDU. [128.32.39.103]) by smtp.gmail.com with ESMTPSA id v13sm30959361pbs.51.2015.11.03.11.46.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 11:46:56 -0800 (PST) From: Palmer Dabbelt To: arnd@arndb.de To: dhowells@redhat.com Cc: viro@zeniv.linux.org.uk Cc: ast@plumgrid.com Cc: aishchuk@linux.vnet.ibm.com Cc: aarcange@redhat.com Cc: akpm@linux-foundation.org Cc: luto@kernel.org Cc: acme@kernel.org Cc: bhe@redhat.com Cc: 3chas3@gmail.com Cc: chris@zankel.net Cc: dave@sr71.net Cc: dyoung@redhat.com Cc: drysdale@google.com Cc: davem@davemloft.net Cc: ebiederm@xmission.com Cc: geoff@infradead.org Cc: gregkh@linuxfoundation.org Cc: hpa@zytor.com Cc: mingo@kernel.org Cc: iulia.manda21@gmail.com Cc: plagnioj@jcrosoft.com Cc: jikos@kernel.org Cc: josh@joshtriplett.org Cc: kexec@lists.infradead.org Cc: linux-api@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: mathieu.desnoyers@efficios.com Cc: jcmvbkbc@gmail.com Cc: paulmck@linux.vnet.ibm.com Cc: a.p.zijlstra@chello.nl Cc: tglx@linutronix.de Cc: tomi.valkeinen@ti.com Cc: vgoyal@redhat.com Cc: x86@kernel.org Cc: Palmer Dabbelt Subject: [PATCH 09/13] Move bp_type_idx to kernel/event/hw_breakpoint.c Date: Tue, 3 Nov 2015 11:46:30 -0800 Message-Id: <1446579994-9937-10-git-send-email-palmer@dabbelt.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1446579994-9937-1-git-send-email-palmer@dabbelt.com> References: <1442271047-4908-1-git-send-email-palmer@dabbelt.com> <1446579994-9937-1-git-send-email-palmer@dabbelt.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This has a "#ifdef CONFIG_*" that used to be exposed to userspace. The names in here are so generic that I don't think it's a good idea to expose them to userspace (or even the rest of the kernel). Since there's only one kernel user, it's been moved to that file. Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Acked-by: Peter Zijlstra (Intel) --- include/uapi/linux/hw_breakpoint.h | 10 ---------- kernel/events/hw_breakpoint.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/hw_breakpoint.h b/include/uapi/linux/hw_breakpoint.h index b04000a..7a6a5a7 100644 --- a/include/uapi/linux/hw_breakpoint.h +++ b/include/uapi/linux/hw_breakpoint.h @@ -17,14 +17,4 @@ enum { HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X, }; -enum bp_type_idx { - TYPE_INST = 0, -#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS - TYPE_DATA = 0, -#else - TYPE_DATA = 1, -#endif - TYPE_MAX -}; - #endif /* _UAPI_LINUX_HW_BREAKPOINT_H */ diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c index 92ce5f4..5ad117e 100644 --- a/kernel/events/hw_breakpoint.c +++ b/kernel/events/hw_breakpoint.c @@ -58,6 +58,16 @@ struct bp_cpuinfo { unsigned int flexible; /* XXX: placeholder, see fetch_this_slot() */ }; +enum bp_type_idx { + TYPE_INST = 0, +#if defined(CONFIG_HAVE_MIXED_BREAKPOINTS_REGS) + TYPE_DATA = 0, +#else + TYPE_DATA = 1, +#endif + TYPE_MAX +}; + static DEFINE_PER_CPU(struct bp_cpuinfo, bp_cpuinfo[TYPE_MAX]); static int nr_slots[TYPE_MAX];