From patchwork Tue Oct 15 21:04:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 3048571 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B5D99BF924 for ; Tue, 15 Oct 2013 21:08:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 01D3B20426 for ; Tue, 15 Oct 2013 21:08:38 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4834E20421 for ; Tue, 15 Oct 2013 21:08:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWBpR-0003YZ-NW; Tue, 15 Oct 2013 21:06:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWBos-000624-Qr; Tue, 15 Oct 2013 21:06:22 +0000 Received: from mail-qe0-f45.google.com ([209.85.128.45]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWBnY-0005sL-Tc for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2013 21:05:03 +0000 Received: by mail-qe0-f45.google.com with SMTP id 8so6917012qea.32 for ; Tue, 15 Oct 2013 14:04:44 -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:cc:subject:date:message-id:in-reply-to :references; bh=I7IM4eCGvInZZHbastduTlMYuRx17PYrYEvLeXsakpg=; b=NK7Fm4Fsy3b97Axp9YM9KWb7ZSw6PsE9raqP5rU0I7ZkahDIEhoZqtLDfr7desj5wN 3vbXwNiPgr7cKZOVebbuJRazT0YuY+sNBk+tRR0hiFiaU+1wd3lH0jBGYrf76s7Vjm7t k1EJepj6EtJEVnMJVC9O2GGRWOQe9BDYv96QXUSstodV+xipv3wvAsmpKbsQ2ofoL4TP X8k3g7YJES03Wnm3ebkWB2T0B8VGODruC45rIMPogrww7ASyrCoy20QW8h+Ug43xX0pk Q7vubbaO3KSoxX/FgXmtH3rO9KNI+OaUW6/Cd/DOStksXy5lXNWqdkggKXkZoIbtGsP5 /tjA== X-Gm-Message-State: ALoCoQmyvpK30Yo4N6+EeSdmgrRbMGDTqZYPUjAOPEtFTz/HBLSfvX8ojT0JdQJIv8TSLBEenGEM X-Received: by 10.49.86.35 with SMTP id m3mr48661447qez.7.1381871084843; Tue, 15 Oct 2013 14:04:44 -0700 (PDT) Received: from localhost.localdomain (pool-72-71-243-183.cncdnh.fast00.myfairpoint.net. [72.71.243.183]) by mx.google.com with ESMTPSA id i4sm159645128qan.0.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:44 -0700 (PDT) From: David Long To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 09/13] ARM: Disable jprobe selftests in thumb kernels Date: Tue, 15 Oct 2013 17:04:24 -0400 Message-Id: <1381871068-27660-10-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381871068-27660-1-git-send-email-dave.long@linaro.org> References: <1381871068-27660-1-git-send-email-dave.long@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131015_170501_149290_9CB1D64C X-CRM114-Status: GOOD ( 10.87 ) X-Spam-Score: -2.6 (--) Cc: "Jon Medhurst \(Tixy\)" , Srikar Dronamraju , Oleg Nesterov , linux-kernel@vger.kernel.org, Rabin Vincent , Ingo Molnar X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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" jprobe kernel selftests are not supported for thumb kernels. Conditionally disable them in the kernel kprobes-test module. Signed-off-by: David A. Long --- arch/arm/kernel/kprobes-test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c index 44a8a13..2144df1 100644 --- a/arch/arm/kernel/kprobes-test.c +++ b/arch/arm/kernel/kprobes-test.c @@ -358,6 +358,7 @@ static int test_kprobe(long (*func)(long, long)) return 0; } +#ifndef CONFIG_THUMB2_KERNEL static void __kprobes jprobe_func(long r0, long r1) { jprobe_func_called = test_func_instance; @@ -401,6 +402,7 @@ static int test_jprobe(long (*func)(long, long)) return 0; } +#endif static int __kprobes kretprobe_handler(struct kretprobe_instance *ri, struct pt_regs *regs) @@ -456,10 +458,12 @@ static int run_api_tests(long (*func)(long, long)) if (ret < 0) return ret; +#ifndef CONFIG_THUMB2_KERNEL pr_info(" jprobe\n"); ret = test_jprobe(func); if (ret < 0) return ret; +#endif pr_info(" kretprobe\n"); ret = test_kretprobe(func);