From patchwork Mon Dec 16 04:08:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 22497 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A5DF523FC7 for ; Mon, 16 Dec 2013 04:09:12 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id r10sf13902481pdi.10 for ; Sun, 15 Dec 2013 20:09:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=uiZMnbxhLqHdlzVILI4ZS6bVoBNWwPNL5iK0IE6TUZ4=; b=U3qCQjDnZajV0FuXnVm4FvOjHBEH4eqfkFGYDfyQcymJHEtJEj+cg24QT7sQoTpJv3 lJnuZPHVE5Ed6eNUTWyLXdssqH/4TONy0U9VcsINj7Xm5hWVOKgRthlFvypy4JWvJ5nZ /DYXnQ8Qv+zcptsunfeE8V/7veKqJVeb/uFHtSHeFeSF19CR8MV9lcHRtgN/SHsIxWRa +60mbqDOdvA82RklBxgkYc5aE8/Lb8zh2i0O+g599As0/bs1Gj9AlmeNwwwlh4xkIQLJ 1f97XChEak3xT+QNoMffsN5kev+iiUvOocr4+40FcVBn1fg8lfV2FBGy7XiOl+0d6OwO TynA== X-Gm-Message-State: ALoCoQnMCzXVABx5z9pBOpMGz86GEDQmkoGmZb0H3pDU/cFLRNkRFMHNvyPsz+bTB1ENIVb++VKE X-Received: by 10.66.20.100 with SMTP id m4mr9160419pae.36.1387166951970; Sun, 15 Dec 2013 20:09:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.86.232 with SMTP id s8ls1898897qez.67.gmail; Sun, 15 Dec 2013 20:09:11 -0800 (PST) X-Received: by 10.52.118.98 with SMTP id kl2mr2456947vdb.30.1387166951802; Sun, 15 Dec 2013 20:09:11 -0800 (PST) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id gx6si3634118vdc.128.2013.12.15.20.09.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:09:11 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id f13so2752142vbg.21 for ; Sun, 15 Dec 2013 20:09:11 -0800 (PST) X-Received: by 10.58.19.195 with SMTP id h3mr924835vee.48.1387166951719; Sun, 15 Dec 2013 20:09:11 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp69933vcz; Sun, 15 Dec 2013 20:09:10 -0800 (PST) X-Received: by 10.229.122.195 with SMTP id m3mr28594897qcr.7.1387166950659; Sun, 15 Dec 2013 20:09:10 -0800 (PST) Received: from mail-qe0-f52.google.com (mail-qe0-f52.google.com [209.85.128.52]) by mx.google.com with ESMTPS id f4si249323qcs.77.2013.12.15.20.09.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:09:10 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.52 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.128.52; Received: by mail-qe0-f52.google.com with SMTP id ne12so3448791qeb.39 for ; Sun, 15 Dec 2013 20:09:10 -0800 (PST) X-Received: by 10.229.126.9 with SMTP id a9mr28733376qcs.0.1387166950493; Sun, 15 Dec 2013 20:09:10 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-183.cncdnh.fast00.myfairpoint.net. [72.71.243.183]) by mx.google.com with ESMTPSA id hb2sm36013890qeb.6.2013.12.15.20.09.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:09:09 -0800 (PST) From: David Long To: linux-arm-kernel@lists.infradead.org, Russell King Cc: Rabin Vincent , "Jon Medhurst (Tixy)" , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org Subject: [PATCH v4 09/16] ARM: Make the kprobes condition_check symbol names more generic Date: Sun, 15 Dec 2013 23:08:43 -0500 Message-Id: <1387166930-13182-10-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387166930-13182-1-git-send-email-dave.long@linaro.org> References: <1387166930-13182-1-git-send-email-dave.long@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: dave.long@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "David A. Long" In preparation for sharing the ARM kprobes instruction interpreting code with uprobes, make the symbols names less kprobes-specific. Signed-off-by: David A. Long --- arch/arm/include/asm/probes.h | 4 ++-- arch/arm/kernel/kprobes-thumb.c | 4 ++-- arch/arm/kernel/probes-arm.c | 2 +- arch/arm/kernel/probes-thumb.c | 2 +- arch/arm/kernel/probes.c | 2 +- arch/arm/kernel/probes.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h index 8032591..81b05b0 100644 --- a/arch/arm/include/asm/probes.h +++ b/arch/arm/include/asm/probes.h @@ -8,7 +8,7 @@ struct arch_specific_insn; typedef void (kprobe_insn_handler_t)(probes_opcode_t, struct arch_specific_insn *, struct pt_regs *); -typedef unsigned long (kprobe_check_cc)(unsigned long); +typedef unsigned long (probes_check_cc)(unsigned long); typedef void (kprobe_insn_singlestep_t)(probes_opcode_t, struct arch_specific_insn *, struct pt_regs *); @@ -18,7 +18,7 @@ typedef void (kprobe_insn_fn_t)(void); struct arch_specific_insn { probes_opcode_t *insn; kprobe_insn_handler_t *insn_handler; - kprobe_check_cc *insn_check_cc; + probes_check_cc *insn_check_cc; kprobe_insn_singlestep_t *insn_singlestep; kprobe_insn_fn_t *insn_fn; }; diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/kernel/kprobes-thumb.c index c648c31..da1e24b 100644 --- a/arch/arm/kernel/kprobes-thumb.c +++ b/arch/arm/kernel/kprobes-thumb.c @@ -70,7 +70,7 @@ t32_decode_cond_branch(probes_opcode_t insn, struct arch_specific_insn *asi, struct decode_header *d) { int cc = (insn >> 22) & 0xf; - asi->insn_check_cc = kprobe_condition_checks[cc]; + asi->insn_check_cc = probes_condition_checks[cc]; asi->insn_handler = t32_simulate_cond_branch; return INSN_GOOD_NO_SLOT; } @@ -424,7 +424,7 @@ t16_decode_cond_branch(probes_opcode_t insn, struct arch_specific_insn *asi, struct decode_header *d) { int cc = (insn >> 8) & 0xf; - asi->insn_check_cc = kprobe_condition_checks[cc]; + asi->insn_check_cc = probes_condition_checks[cc]; asi->insn_handler = t16_simulate_cond_branch; return INSN_GOOD_NO_SLOT; } diff --git a/arch/arm/kernel/probes-arm.c b/arch/arm/kernel/probes-arm.c index e50fb03..95ef3e3 100644 --- a/arch/arm/kernel/probes-arm.c +++ b/arch/arm/kernel/probes-arm.c @@ -726,7 +726,7 @@ arm_kprobe_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, struct decode_header *actions) { asi->insn_singlestep = arm_singlestep; - asi->insn_check_cc = kprobe_condition_checks[insn>>28]; + asi->insn_check_cc = probes_condition_checks[insn>>28]; return kprobe_decode_insn(insn, asi, kprobe_decode_arm_table, false, (const union decode_item *) actions); } diff --git a/arch/arm/kernel/probes-thumb.c b/arch/arm/kernel/probes-thumb.c index e6dbbc3..055faf0 100644 --- a/arch/arm/kernel/probes-thumb.c +++ b/arch/arm/kernel/probes-thumb.c @@ -837,7 +837,7 @@ EXPORT_SYMBOL_GPL(kprobe_decode_thumb16_table); static unsigned long __kprobes thumb_check_cc(unsigned long cpsr) { if (unlikely(in_it_block(cpsr))) - return kprobe_condition_checks[current_cond(cpsr)](cpsr); + return probes_condition_checks[current_cond(cpsr)](cpsr); return true; } diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c index 7354448..36fafd2 100644 --- a/arch/arm/kernel/probes.c +++ b/arch/arm/kernel/probes.c @@ -163,7 +163,7 @@ static unsigned long __kprobes __check_al(unsigned long cpsr) return true; } -kprobe_check_cc * const kprobe_condition_checks[16] = { +probes_check_cc * const probes_condition_checks[16] = { &__check_eq, &__check_ne, &__check_cs, &__check_cc, &__check_mi, &__check_pl, &__check_vs, &__check_vc, &__check_hi, &__check_ls, &__check_ge, &__check_lt, diff --git a/arch/arm/kernel/probes.h b/arch/arm/kernel/probes.h index c0536b1..e7c7a92 100644 --- a/arch/arm/kernel/probes.h +++ b/arch/arm/kernel/probes.h @@ -394,7 +394,7 @@ extern const union decode_item kprobe_decode_arm_table[]; extern const union decode_item kprobes_arm_actions[]; #endif -extern kprobe_check_cc * const kprobe_condition_checks[16]; +extern probes_check_cc * const probes_condition_checks[16]; int kprobe_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,