From patchwork Mon Jun 15 16:42:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 6610741 Return-Path: X-Original-To: patchwork-linux-sh@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 3EF609F326 for ; Mon, 15 Jun 2015 16:43:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5154D2077D for ; Mon, 15 Jun 2015 16:43:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EFF520776 for ; Mon, 15 Jun 2015 16:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489AbbFOQn1 (ORCPT ); Mon, 15 Jun 2015 12:43:27 -0400 Received: from mail-qk0-f177.google.com ([209.85.220.177]:34819 "EHLO mail-qk0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754405AbbFOQnE (ORCPT ); Mon, 15 Jun 2015 12:43:04 -0400 Received: by qkhq76 with SMTP id q76so56711072qkh.2 for ; Mon, 15 Jun 2015 09:43:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pQV+2+/HPnlstOQd5SWvo8Qjk24ryTJ3gN9phlrVSVk=; b=gRbVsuxdSKAmlyaRa+z6xT01hg1T/6tYOs/2xq9uOgSPI5rQipEf+4V5cBv7cl1JLS DFW3HgND4uzLMPv3xM08+oWcRmxlE/A2eYj6LEXd1SvA8Ne1q6WO/qHtkO3IVKnZ8Qj3 Hokk1ySsXb5eHqHYp1DXkkFfZ8YtNg+NzqiprnWYUNKXRkQz7q1cV9+AcR7NNQH0yu2K QdHsavFPF61MwFGSZ2Dy2T/5WlH1z+Pg+X4Lzxl1fTL8pjpQxr+KfOHIHZkbVB8yP502 95HOWGpjWVG1lmaqsecOojWY9+daTaEItxSgllK5Wp0aZUAZZ9jlt0OEWNPE81YU5z7N Puvw== X-Gm-Message-State: ALoCoQnTyGGvfRsTiL61aLTINgDAV5Z1CABclBsechsc3nACj533EUxBn+urOnZDdwgUbcs6As05 X-Received: by 10.140.88.5 with SMTP id s5mr26263300qgd.59.1434386584084; Mon, 15 Jun 2015 09:43:04 -0700 (PDT) Received: from localhost.localdomain (pool-72-71-243-249.cncdnh.fast00.myfairpoint.net. [72.71.243.249]) by mx.google.com with ESMTPSA id 67sm6544026qkx.38.2015.06.15.09.43.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jun 2015 09:43:03 -0700 (PDT) From: David Long To: "H. Peter Anvin" , Andy Lutomirski , Anton Blanchard , Behan Webster , Benjamin Herrenschmidt , Eric Paris , Heiko Carstens , Ingo Molnar , Jan Willeke , Kees Cook , Martin Schwidefsky , Michael Ellerman , Nikolay Borisov , Oleg Nesterov , Paul Mackerras , Richard Kuo , Robert Richter , Roland McGrath , Russell King , Tejun Heo , Thomas Gleixner , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux390@de.ibm.com, linuxppc-dev@lists.ozlabs.org, x86@kernel.org Subject: [PATCH 1/2] Move the pt_regs_offset struct definition from arch to common include file Date: Mon, 15 Jun 2015 12:42:58 -0400 Message-Id: <1434386579-6045-2-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1434386579-6045-1-git-send-email-dave.long@linaro.org> References: <1434386579-6045-1-git-send-email-dave.long@linaro.org> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: "David A. Long" The pt_regs_offset structure is used for HAVE_REGS_AND_STACK_ACCESS_API feature and has identical definitions in four different arch ptrace.h include files. It seems unlikely that definition would ever need to be changed regardless of architecture so lets move it into include/linux/ptrace.h. Signed-off-by: David A. Long Acked-by: Michael Ellerman Acked-by: Michael Ellerman --- arch/arm/kernel/ptrace.c | 5 ----- arch/powerpc/kernel/ptrace.c | 5 ----- arch/sh/include/asm/ptrace.h | 5 ----- arch/x86/kernel/ptrace.c | 5 ----- include/linux/ptrace.h | 9 +++++++++ 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index ef9119f..fb45cf1 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -59,11 +59,6 @@ #define BREAKINST_THUMB 0xde01 #endif -struct pt_regs_offset { - const char *name; - int offset; -}; - #define REG_OFFSET_NAME(r) \ {.name = #r, .offset = offsetof(struct pt_regs, ARM_##r)} #define REG_OFFSET_END {.name = NULL, .offset = 0} diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index f21897b..ab81733 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -52,11 +52,6 @@ #define PARAMETER_SAVE_AREA_OFFSET 48 /* bytes */ #endif -struct pt_regs_offset { - const char *name; - int offset; -}; - #define STR(s) #s /* convert to string */ #define REG_OFFSET_NAME(r) {.name = #r, .offset = offsetof(struct pt_regs, r)} #define GPR_OFFSET_NAME(num) \ diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index 2506c7d..677c72b 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h @@ -23,11 +23,6 @@ /* * kprobe-based event tracer support */ -struct pt_regs_offset { - const char *name; - int offset; -}; - #define REG_OFFSET_NAME(r) {.name = #r, .offset = offsetof(struct pt_regs, r)} #define REGS_OFFSET_NAME(num) \ {.name = __stringify(r##num), .offset = offsetof(struct pt_regs, regs[num])} diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index a7bc794..f135d35 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -53,11 +53,6 @@ enum x86_regset { REGSET_IOPERM32, }; -struct pt_regs_offset { - const char *name; - int offset; -}; - #define REG_OFFSET_NAME(r) {.name = #r, .offset = offsetof(struct pt_regs, r)} #define REG_OFFSET_END {.name = NULL, .offset = 0} diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 987a73a..b0b1ee6 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -383,4 +383,13 @@ extern int task_current_syscall(struct task_struct *target, long *callno, unsigned long args[6], unsigned int maxargs, unsigned long *sp, unsigned long *pc); +#ifdef CONFIG_HAVE_REGS_AND_STACK_ACCESS_API + +struct pt_regs_offset { + const char *name; + int offset; +}; + +#endif /* CONFIG_HAVE_REGS_AND_STACK_ACCESS_API */ + #endif