From patchwork Tue Nov 10 01:31:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 7587291 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 73A93C05C6 for ; Tue, 10 Nov 2015 01:32:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8257E20708 for ; Tue, 10 Nov 2015 01:32:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D2AD205DF for ; Tue, 10 Nov 2015 01:32:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbbKJBcH (ORCPT ); Mon, 9 Nov 2015 20:32:07 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36187 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752411AbbKJBb5 (ORCPT ); Mon, 9 Nov 2015 20:31:57 -0500 Received: by pacdm15 with SMTP id dm15so192690865pac.3 for ; Mon, 09 Nov 2015 17:31:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt_com.20150623.gappssmtp.com; s=20150623; h=from:to: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:subject :date:message-id:in-reply-to:references; bh=Hm/7pV3qp9/887S0zJ5TL4uLrlYGtFGoqOnQwyDymK0=; b=EZkPr30qutSkkXCV8z1vWOU9hIy4iXxnuTlkQgs1WP3YM1XAVf0kI5GyUbCAr8N9jC dY1CS42F2Klf7Jfcx9PI/5xKUhIEUOOtB4G1Vu4NT3xt1Yf11K6wJBAXjeJuPhaPnHHd B55SJwywcFiZkl3sNTeaD3w9HvqAHD9gV3GChR0jpWFZq1OAESkPjRsiL7QBDFH7nD22 gXkJApOJXYEFPRimIy5X0HgN8Gx76oYqXRDJg1ny/x8N0lRdoCTpyJLOyT655ZRhwTpz /5+nxaMRA60X6BT1wEZYdKwzS65KcFRcjKU1fsxUnUL7+Fgz0qGQR+t5RMe9QM47jTXj PGOg== 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: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:subject:date:message-id:in-reply-to:references; bh=Hm/7pV3qp9/887S0zJ5TL4uLrlYGtFGoqOnQwyDymK0=; b=SEbrMJNOHg6f53gK7PeeRGK8E4PV/VBn7JPLrEvprk0z0bNLwzrLuwH0UlfDdjf/9F I4iBjKAOkyf1+L9OoDVfTCQmERjGV6EWqYXxWwzgueB1l9dIIDXNbo5QXlS2AJdy+uGC Bnw6shzzHM2bdf7d9XtChxaCEYd75WVXY7xqluVCTcENuuajkGIl/WFxjMqnhlAuwu3H boePvG1dmJ4ZYv5mHoO+fMoOo1NYGpfu82xJftF6WVXA5fveR9NJnxXkD7GGEYw6azXZ omOosVSgPyqDhnCXqNYHe+SQgzyY+1mw+D0bPgkBFgTL9nhUJp/B99ClQANDDjYUwFp2 d+9Q== X-Gm-Message-State: ALoCoQnsV3ipodEQFFowI+H2FYVefxigV4AV++b6k3hlTlZ6hMiVX9iCBW3Z8CwqyPkSwARpWt1G X-Received: by 10.66.156.1 with SMTP id wa1mr1602026pab.84.1447119116675; Mon, 09 Nov 2015 17:31:56 -0800 (PST) Received: from localhost (wap-cal.CS.Berkeley.EDU. [128.32.35.228]) by smtp.gmail.com with ESMTPSA id ku1sm601786pbc.47.2015.11.09.17.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2015 17:31:56 -0800 (PST) From: Palmer Dabbelt To: arnd@arndb.de To: dhowells@redhat.com To: peterz@infradead.org 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: 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/14] Move bp_type_idx to include/linux/hw_breakpoint.h Date: Mon, 9 Nov 2015 17:31:06 -0800 Message-Id: <1447119071-19392-10-git-send-email-palmer@dabbelt.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1447119071-19392-1-git-send-email-palmer@dabbelt.com> References: <1446579994-9937-1-git-send-email-palmer@dabbelt.com> <1447119071-19392-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=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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). There are multiple in-kernel users, so it's been moved to a kernel header file. Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou --- include/linux/hw_breakpoint.h | 10 ++++++++++ include/uapi/linux/hw_breakpoint.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h index 0464c85..dfe0376 100644 --- a/include/linux/hw_breakpoint.h +++ b/include/linux/hw_breakpoint.h @@ -6,6 +6,16 @@ #ifdef CONFIG_HAVE_HW_BREAKPOINT +enum bp_type_idx { + TYPE_INST = 0, +#if defined(CONFIG_HAVE_MIXED_BREAKPOINTS_REGS) + TYPE_DATA = 0, +#else + TYPE_DATA = 1, +#endif + TYPE_MAX +}; + extern int __init init_hw_breakpoint(void); static inline void hw_breakpoint_init(struct perf_event_attr *attr) 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 */