From patchwork Thu Jan 23 20:05:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 23648 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AAFA320307 for ; Thu, 23 Jan 2014 20:06:19 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id vb8sf8002565obc.10 for ; Thu, 23 Jan 2014 12:06:18 -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=eephx5qbZYUn/x3UJazkjxpzpbtqOHGOka+GBOLjHdM=; b=bm+ehWlg0pn2agcFhdI6KUW+L2xjW36ZQVOqpC7oVJpY6MSKipw1q5tOj1yBjCx4fp KntbICi2IYEHIh6wcPva+ZQ+4MtUToRJUShevQqHGKuKQaAJhK0vsa0zjtidYFFLt6us P6fwYxM7ZsfxChFz3PIgtL/AzaVDjWBP2B71wGUoTApXAmJrBI2DrDQNpuTHPhAVrV5X kor5DFGb5LNEnwmLrCzym8osSjNkm03RhyQeIbZZXe9QcmaOu2cYnzEfQaD6y2SSsow9 Ipaz3EUX79N6AxY7NXvthQlHYJSSqq/Dz7fJQKzaP4nzknfaeffgxC+yIvwaWCjAMyvV bDFA== X-Gm-Message-State: ALoCoQmPpcnHyl22JfF78uPnVZuH1SLDFRn51ZU6AHGGo/lRygYWze44QwgUY9z7DlU1qVS1DgKh X-Received: by 10.182.55.102 with SMTP id r6mr3778099obp.7.1390507578788; Thu, 23 Jan 2014 12:06:18 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.72 with SMTP id li8ls420770qeb.32.gmail; Thu, 23 Jan 2014 12:06:18 -0800 (PST) X-Received: by 10.58.181.230 with SMTP id dz6mr2489000vec.35.1390507578678; Thu, 23 Jan 2014 12:06:18 -0800 (PST) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id dp3si7210267vcb.96.2014.01.23.12.06.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 12:06:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id oy12so1421524veb.14 for ; Thu, 23 Jan 2014 12:06:18 -0800 (PST) X-Received: by 10.58.86.230 with SMTP id s6mr5508080vez.16.1390507578401; Thu, 23 Jan 2014 12:06:18 -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 u4csp51585vcz; Thu, 23 Jan 2014 12:06:17 -0800 (PST) X-Received: by 10.140.96.202 with SMTP id k68mr14057418qge.84.1390507576441; Thu, 23 Jan 2014 12:06:16 -0800 (PST) Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by mx.google.com with ESMTPS id 7si8555119qal.29.2014.01.23.12.06.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 12:06:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.182 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.216.182; Received: by mail-qc0-f182.google.com with SMTP id c9so3184300qcz.13 for ; Thu, 23 Jan 2014 12:06:16 -0800 (PST) X-Received: by 10.140.42.180 with SMTP id c49mr14134687qga.24.1390507576011; Thu, 23 Jan 2014 12:06:16 -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 js9sm13677540qeb.9.2014.01.23.12.06.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 12:06:15 -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 v5 09/16] ARM: Make the kprobes condition_check symbol names more generic Date: Thu, 23 Jan 2014 15:05:52 -0500 Message-Id: <1390507559-4697-10-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1390507559-4697-1-git-send-email-dave.long@linaro.org> References: <1390507559-4697-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.128.169 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 5b09f9e..c4acf6c 100644 --- a/arch/arm/include/asm/probes.h +++ b/arch/arm/include/asm/probes.h @@ -26,7 +26,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 *); @@ -36,7 +36,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 dcc6b29..8608e18 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 7bf0330..f0c3720 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, const union decode_action *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, actions); } diff --git a/arch/arm/kernel/probes-thumb.c b/arch/arm/kernel/probes-thumb.c index 6cf168b..f954e14 100644 --- a/arch/arm/kernel/probes-thumb.c +++ b/arch/arm/kernel/probes-thumb.c @@ -838,7 +838,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 35a3a26..139c08f 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 383d42d..a8231fa 100644 --- a/arch/arm/kernel/probes.h +++ b/arch/arm/kernel/probes.h @@ -406,7 +406,7 @@ extern const union decode_item kprobe_decode_arm_table[]; extern const union decode_action 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,