From patchwork Fri Oct 9 17:01:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Stanislaw Gruszka X-Patchwork-Id: 11826855 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 262BF15E6 for ; Fri, 9 Oct 2020 17:03:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CECD22225F for ; Fri, 9 Oct 2020 17:03:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="R+CW+rSv"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="canY2c/U"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="u7cL2Yo1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CECD22225F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:Reply-To:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:MIME-Version:Subject:To:From:Date: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Snf32MzQyZLNDHYMjqTub7GE//E+8QZNzMVZvFtdASw=; b=R+CW+rSvkkWV9z5+MD0vWFYrU5 xe3rIb2REgvMS1+Z+Vnul+ql5OqAzKWbYsv9CplxBDW8OLEhh0skCCyQ0exyLMynFs5+lyQbA+khK Um7DizkNtKwiLmklNXWDH3X3Ng941i/pq1xxBN8RwCM0HjfG073lwFVhHfGRdJ+HS8GckdwNojXzr MO6u1smjKhOafDHy4hTke6cJPLHVmSqjpuwDnFrDLJr0hlkSDZUT2TMkrgEq9yi1FW7tHv4jBwkF5 w/WThlxRJUAKw6bcXudzMVInRQXsvGNjZOwN4LTZfYIAgAK7jwLG9IvzZRTxI30/EaUCS1HCloK1K HAyUOF1w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQvlt-0004mk-OZ; Fri, 09 Oct 2020 17:01:33 +0000 Received: from galois.linutronix.de ([193.142.43.55]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQvlo-0004h1-96 for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2020 17:01:31 +0000 Date: Fri, 09 Oct 2020 17:01:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1602262885; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgofgssIpxJD+MJd9wmuA+oG6UILiKSR8ZUcMt4MrNk=; b=canY2c/UmMDSdDS+10F/QLhpBy8iQlHo77YuH23ZMJIEJNthv+u2BUQRgCesS0Ipdz+c99 du0Cx3pniak5JUTR2Pb9SB8MqyWd/GtxiaQpvNeoVqwjBJs9KxbHk6/EDE8PdsfGztbuYa etBJP5Fymh1pprx4OGAW+Mv5dsjCKI1HuMk9iB4loM+DNUOxO1vv33N9nNO0TIufwgriVE rvXrSjCgPxKcgCakQyHu1dVBKxskwArwTYHN/4u7jr47x6tBOTo6GIjkDKUCxwr6SWLLIQ 0sGGYFFCSIPDxnB8xnQnW1zRZOkvTX+VTKn/b17vgp+yFLgbaPM9JuhwHA/Stg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1602262885; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgofgssIpxJD+MJd9wmuA+oG6UILiKSR8ZUcMt4MrNk=; b=u7cL2Yo1ew+fmu7IEy9LlcP/E23rgiSN520/fT/EvzZCJ8/n5CMmt1Gp/wIOzJA3mpCru9 38XQlUGnz0i8DNBg== From: "tip-bot2 for Thomas Gleixner" To: linux-tip-commits@vger.kernel.org Subject: [tip: core/rcu] ARM: Cleanup PREEMPT_COUNT leftovers MIME-Version: 1.0 Message-ID: <160226288496.7002.1274806219589199865.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201009_130128_507447_78D09A48 X-CRM114-Status: GOOD ( 10.58 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [193.142.43.55 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: linux-kernel@vger.kernel.org Cc: "Paul E. McKenney" , x86 , Russell King , LKML , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The following commit has been merged into the core/rcu branch of tip: Commit-ID: 87f3bae4f141fd3d690e13bf09a6abb773c717a7 Gitweb: https://git.kernel.org/tip/87f3bae4f141fd3d690e13bf09a6abb773c717a7 Author: Thomas Gleixner AuthorDate: Mon, 14 Sep 2020 19:31:57 +02:00 Committer: Paul E. McKenney CommitterDate: Mon, 28 Sep 2020 16:03:21 -07:00 ARM: Cleanup PREEMPT_COUNT leftovers CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so. Signed-off-by: Thomas Gleixner Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul E. McKenney --- arch/arm/include/asm/assembler.h | 11 ----------- arch/arm/kernel/iwmmxt.S | 2 -- arch/arm/mach-ep93xx/crunch-bits.S | 2 -- 3 files changed, 15 deletions(-) diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index feac2c8..fce52ee 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -212,7 +212,6 @@ /* * Increment/decrement the preempt count. */ -#ifdef CONFIG_PREEMPT_COUNT .macro inc_preempt_count, ti, tmp ldr \tmp, [\ti, #TI_PREEMPT] @ get preempt count add \tmp, \tmp, #1 @ increment it @@ -229,16 +228,6 @@ get_thread_info \ti dec_preempt_count \ti, \tmp .endm -#else - .macro inc_preempt_count, ti, tmp - .endm - - .macro dec_preempt_count, ti, tmp - .endm - - .macro dec_preempt_count_ti, ti, tmp - .endm -#endif #define USERL(l, x...) \ 9999: x; \ diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index 0dcae78..1f845be 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S @@ -94,9 +94,7 @@ ENTRY(iwmmxt_task_enable) mov r2, r2 @ cpwait bl concan_save -#ifdef CONFIG_PREEMPT_COUNT get_thread_info r10 -#endif 4: dec_preempt_count r10, r3 ret r9 @ normal exit from exception diff --git a/arch/arm/mach-ep93xx/crunch-bits.S b/arch/arm/mach-ep93xx/crunch-bits.S index fb2dbf7..0aabcf4 100644 --- a/arch/arm/mach-ep93xx/crunch-bits.S +++ b/arch/arm/mach-ep93xx/crunch-bits.S @@ -191,9 +191,7 @@ crunch_load: cfldr64 mvdx15, [r0, #CRUNCH_MVDX15] 1: -#ifdef CONFIG_PREEMPT_COUNT get_thread_info r10 -#endif 2: dec_preempt_count r10, r3 ret lr