From patchwork Thu Oct 29 16:50:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 11866887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 207B5C55179 for ; Thu, 29 Oct 2020 16:51:48 +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 8973120FC3 for ; Thu, 29 Oct 2020 16:51:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vieiTEQZ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eIvphrFb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8973120FC3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.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:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZRFKJFfM7OHGhoDhhrtL/HM8TpyWW8KAVywjaqGBwzU=; b=vieiTEQZhlWZexPtmkDPZUZFT Bf6msXrVMbmkPGMkaF6uXl9ZTQWXM+chuC2T6K+XYVM/Bu+C+gDM+aIR9cjJkq90Z1iCsMphPZu1D qKPzEf346kYifEYCH4KHWO3SRJ6H/VcrCtTCOl6N4W8CLi4mQh2aVuCHjocqaVkTsUUmat9LoD39l yKB4phW7nMs087QXwJPu3cN9peHmwGK9Yadp1rFSXO87LopwDwvj+7UpLf2LibdmVBgJPs41tWbyj W7Lak/lFcCks56SvqAwkmdHoI5rvVhWEojMFFdZDYEFr+8zvkNxP19BnpmpyMCzkCbr1pxlrdZKkC EkgXh64aA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYB8n-0001Aj-Jx; Thu, 29 Oct 2020 16:51:09 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYB8T-000142-BX for linux-arm-kernel@lists.infradead.org; Thu, 29 Oct 2020 16:50:56 +0000 Received: by mail-lj1-x243.google.com with SMTP id i2so3859117ljg.4 for ; Thu, 29 Oct 2020 09:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oXgzbe5U4XFLjsPCkUNXib2Ktv+heUH4fugO2/UuzAo=; b=eIvphrFb6Q5RrUDDTUMSr/ZMno55i9Sfn6olZ6eliCMHBduQPnRptiLXYdthVxFvpy 40beSO4pwApyCVPB67+ZLXrtP+oKd9oSCWMwLlyaVoBF8DgHOUi/iGn0KwKNULCU3JZs ibpE30pqivMWX++pWEmP6KCu/MnfbpIqlsl6dCoiMw7nNysmGBSaUo3OfpiC0lHCpCwj u6X7+x46SycUEbttqtwdKRjgiRCTsQFF0AtfOW0IiEWPVndIJZoSXQg6NwcnPXSjTb5O ofQGURp3/KMyOs38KtkMg14y6oQ/DrWOsOm4qtk9eh/vtZffhJTzVPzSxp7kH1NBQW1R 5QCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oXgzbe5U4XFLjsPCkUNXib2Ktv+heUH4fugO2/UuzAo=; b=MSKJFoxBrJdABDS22L1IlKVQHs7QmywduAZng+mps6mCeFckhS11NU31t91Sx3fsy6 IQo9sm+d7PvUWLZ63+YBTW8NHclXXNkf49Ry5IXsO0xuhe2lMoMvhGTFimbBmRo66SMz ENiU1Gs8LcxEWHQoTFzx3y8m4BGsTczjw5F8/ycrUW+k2Ct25QnlUqtuEafV78ebNuCo PVeTIP4Bl2Ss2+NZeRgiVIlY3fYVAJkLvIo6H/XCwLZEaqnEQU8NzbqEISVUEFLvvF3j gWuuzLhWN+mHpVmnOWttPOwdast5CXj+zfiC++1/LLhhjVu8lZH+Dpt0UomLY/0sgQrs N6Pw== X-Gm-Message-State: AOAM532phR9vBFCrcAIhTs66IZSrmL4exOFJOuiveDAPwxgQP5/e2X91 GV2O8jj9kmfuCpauTGvROg8= X-Google-Smtp-Source: ABdhPJz/xfeA78PUVoSA71gyzWBpq4L4DajkrXaeh+qAnK7jcOb73wLBU+fe54cuz73BS52PPDMjjw== X-Received: by 2002:a2e:80d7:: with SMTP id r23mr2361375ljg.390.1603990247550; Thu, 29 Oct 2020 09:50:47 -0700 (PDT) Received: from pc638.lan (h5ef52e31.seluork.dyn.perspektivbredband.net. [94.245.46.49]) by smtp.gmail.com with ESMTPSA id s1sm331832lfd.236.2020.10.29.09.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 09:50:46 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: LKML , RCU , "Paul E . McKenney" Subject: [PATCH 10/16] ARM: Cleanup PREEMPT_COUNT leftovers Date: Thu, 29 Oct 2020 17:50:13 +0100 Message-Id: <20201029165019.14218-10-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201029165019.14218-1-urezki@gmail.com> References: <20201029165019.14218-1-urezki@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_125049_501813_F394FEE9 X-CRM114-Status: GOOD ( 13.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , "Theodore Y . Ts'o" , Peter Zijlstra , Sebastian Andrzej Siewior , Russell King , Uladzislau Rezki , Joel Fernandes , Andrew Morton , Oleksiy Avramchenko , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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: Uladzislau Rezki (Sony) --- 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 feac2c8b86f2..fce52eedc6e1 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 0dcae787b004..1f845be78c43 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 fb2dbf76f09e..0aabcf4ebe8e 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