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: 21054 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 597DD20D84 for ; Tue, 15 Oct 2013 21:04:47 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id va2sf33230598obc.1 for ; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state: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=I7IM4eCGvInZZHbastduTlMYuRx17PYrYEvLeXsakpg=; b=hDGNmDPlMLFefHroJ0ZyeRBAxSoZICtEfMgxs+ZvnXZupF8+NLSZIGKs0RHIrsj3pd 0sMEOvPGhubvohoaUJcIHIYD2BLcVWontdqXB2HBnZxYMA+9CZdVH4gXF2QRERacV0OR +Xk1YKE1uSI1rireVuo2+an5vH/+Ef5eJS3A4HENka4wO4vkQogamcwuQ9+ma/61va4y fr+RrY4Zq9FoTtd8wfi0nQQNE767fGrJneaj+/Ku84aHqUr/3v1LgDbHKPklSxsovKz+ wYzv9n1yWGnSD7n/AccEGNkRnZjCp40Ve3zxsBplL4b8v05u2HABiVpY17Z3URRDZRF9 eC+g== X-Received: by 10.182.66.193 with SMTP id h1mr1371218obt.47.1381871086729; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.200 with SMTP id m8ls266765qeh.1.gmail; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) X-Received: by 10.58.255.233 with SMTP id at9mr3304039ved.20.1381871086587; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id sc5si23434948vdc.48.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.49 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.49; Received: by mail-vb0-f49.google.com with SMTP id w16so5312967vbb.8 for ; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) X-Gm-Message-State: ALoCoQnAShNCI5Me52QurRv7u2E+auFhn6UuKGRSYdmzNOU/b6XtcGVG5lJSDObeIDdoDkH6fQen X-Received: by 10.58.67.9 with SMTP id j9mr13518943vet.3.1381871086512; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) 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 u4csp328429vcz; Tue, 15 Oct 2013 14:04:46 -0700 (PDT) X-Received: by 10.49.121.134 with SMTP id lk6mr24415194qeb.29.1381871085015; Tue, 15 Oct 2013 14:04:45 -0700 (PDT) Received: from mail-qa0-f52.google.com (mail-qa0-f52.google.com [209.85.216.52]) by mx.google.com with ESMTPS id x3si33453619qed.68.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.216.52 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.216.52; Received: by mail-qa0-f52.google.com with SMTP id w8so3517000qac.4 for ; Tue, 15 Oct 2013 14:04:44 -0700 (PDT) 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 Cc: Rabin Vincent , "Jon Medhurst (Tixy)" , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , linux-kernel@vger.kernel.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-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.49 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" 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);