Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3384088pxk; Mon, 28 Sep 2020 16:33:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfbgV0GWr7Y1gGJNtHKQUVj0q2v6h9f7ry4SuM6c+D7TnfN4OXl7iEa0GiOPXiMkBQAQIs X-Received: by 2002:a17:906:7cc6:: with SMTP id h6mr1135812ejp.266.1601336024782; Mon, 28 Sep 2020 16:33:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601336024; cv=none; d=google.com; s=arc-20160816; b=xN6DkdIGTXpMXXaIllm5g/kvOdFvNBK1TO8sop3i7AXGUCVjvy1R/YFhKtzo+ImhwK mRs4je1NXE2d5vP8WsvpUv5872jK89qyEQftf2XqVIG85gcmLmAPaWPXiy1ctFRrSzDC jqacfenPEd9zNGXRT2winIrCxZKVLmVwgSs8z78HK8/8nralhmVmncY3UbUEejlumKgV DvcNQ6F8aNV5hlIJ/zedV0uAv4C2QM0mI2e5BTZuedB3pzFIEUHwOKLX1TGgwuq2XaTQ IN1hNnaHuhAoNxsQCGp5Oe/k0S/ZVgY/LA30uE2k9cV/cWlWSR3HMtN8M/SBGbOx4/Gg NE5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=dTvYjW8JzNQ1ab/ilgF45u9ULbQNnv20eSRbtNkaqo8=; b=Cvh6bg9Q3OJMVW7Wal2HsC9lcuGp+TyEkDtBdzCyFYt38P+tTXwtwBdUyCUHW8SBii WU3v7oUw3J9ugKITkvVrVz435IDJfn1y5OaGj4wtiCRXycg1e2PgyQydRJ2rggZkgOs8 3+vaNLk2Z5UE6khoTUocfwMv8B1hIQDdjgGmrB5YL7H8UkbkR1xBOcy4V0++IC3o/jpu T6SOHuoZdZiTBZyEIO8rbHxfH8+pO5GwQrMWu1dERpFthTOpUzHqK5fSANajDaSgOPJz 2GnGaEms0FLRL2vB0W8OMIiHW/h/0L6guvAgDzFKEb3/SHq3D4FIePfeKRh+FQEyEBBt EWVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Bia3xpdN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w5si1511187eji.82.2020.09.28.16.33.10; Mon, 28 Sep 2020 16:33:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Bia3xpdN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727323AbgI1Xb2 (ORCPT + 99 others); Mon, 28 Sep 2020 19:31:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:54362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727222AbgI1XbH (ORCPT ); Mon, 28 Sep 2020 19:31:07 -0400 Received: from paulmck-ThinkPad-P72.home (unknown [50.45.173.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 41F7F221F0; Mon, 28 Sep 2020 23:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601335866; bh=/M6aOJivvPIdAQhbwu27MlHHlosSgfXplSqgr0JOZCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bia3xpdNCo94eUc8NlGuMBeeV2GiqCLFKuiUuYKGa50jWn44ILMEILwtQvMu4FIdk ex/W9oaFbAcDTc2H/edHbjh3/t+ybv8/OY58zcvClaI+ARyhfYVhdkXQozL6hOxImv wQgaSMz1AUo1X/TR5uSUXKVRigX18feWbMQioz4c= From: paulmck@kernel.org To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, mingo@kernel.org, jiangshanlai@gmail.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, mhocko@kernel.org, mgorman@techsingularity.net, torvalds@linux-foundation.org, Russell King , linux-arm-kernel@lists.infradead.org, "Paul E . McKenney" Subject: [PATCH tip/core/rcu 09/15] ARM: Cleanup PREEMPT_COUNT leftovers Date: Mon, 28 Sep 2020 16:30:56 -0700 Message-Id: <20200928233102.24265-9-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200928233041.GA23230@paulmck-ThinkPad-P72> References: <20200928233041.GA23230@paulmck-ThinkPad-P72> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner 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..fce52eed 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 -- 2.9.5