From patchwork Mon Mar 2 14:24:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 5913541 Return-Path: X-Original-To: patchwork-linux-arm@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 663F6BF440 for ; Mon, 2 Mar 2015 14:30:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B51320218 for ; Mon, 2 Mar 2015 14:30:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA8662020F for ; Mon, 2 Mar 2015 14:30:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSRK7-0004mJ-Vz; Mon, 02 Mar 2015 14:27:55 +0000 Received: from szxga01-in.huawei.com ([119.145.14.64]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSRJ2-0003iQ-Ox for linux-arm-kernel@lists.infradead.org; Mon, 02 Mar 2015 14:26:53 +0000 Received: from 172.24.2.119 (EHLO lggeml422-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CKE50584; Mon, 02 Mar 2015 22:25:49 +0800 (CST) Received: from kernel-host.huawei (10.107.197.247) by lggeml422-hub.china.huawei.com (10.72.61.32) with Microsoft SMTP Server id 14.3.158.1; Mon, 2 Mar 2015 22:25:38 +0800 From: Wang Nan To: , , , , Subject: [RFC PATCH v4 08/34] early kprobes: ARM: add definition for vmlinux.lds use. Date: Mon, 2 Mar 2015 22:24:46 +0800 Message-ID: <1425306312-3437-9-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> References: <1425306312-3437-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150302_062649_039077_317DC9ED X-CRM114-Status: UNSURE ( 6.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) Cc: x86@kernel.org, lizefan@huawei.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 This patch defines MAX_OPTINSN_SIZE, MAX_INSN_SIZE and KPROBE_OPCODE_SIZE for ARM for vmlinux.lds.S use. These macros are originally defined in kprobes.h, which are unable to be used in vmlinux.lds. Signed-off-by: Wang Nan --- arch/arm/kernel/vmlinux.lds.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index b31aa73..09fcc20 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -45,6 +45,16 @@ #define ARM_EXIT_DISCARD(x) x #endif +#ifdef CONFIG_EARLY_KPROBES +# ifdef CONFIG_THUMB2_KERNEL +# define MAX_OPTINSN_SIZE 0 +# else +# define MAX_OPTINSN_SIZE (optprobe_template_end - optprobe_template_entry) +# endif +# define MAX_INSN_SIZE 2 +# define KPROBE_OPCODE_SIZE 4 +#endif + OUTPUT_ARCH(arm) ENTRY(stext)