From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 50613C4320E for ; Fri, 13 Aug 2021 14:53:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DC08960F00 for ; Fri, 13 Aug 2021 14:53:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DC08960F00 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 7ADD38D0003; Fri, 13 Aug 2021 10:53:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75E2F8D0001; Fri, 13 Aug 2021 10:53:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 625BB8D0003; Fri, 13 Aug 2021 10:53:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0235.hostedemail.com [216.40.44.235]) by kanga.kvack.org (Postfix) with ESMTP id 44CCB8D0001 for ; Fri, 13 Aug 2021 10:53:00 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E059D8249980 for ; Fri, 13 Aug 2021 14:52:59 +0000 (UTC) X-FDA: 78470349678.32.02D9F26 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf02.hostedemail.com (Postfix) with ESMTP id A2CF47001775 for ; Fri, 13 Aug 2021 14:52:59 +0000 (UTC) Received: by mail-pl1-f181.google.com with SMTP id d1so12316782pll.1 for ; Fri, 13 Aug 2021 07:52:59 -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:mime-version :content-transfer-encoding; bh=CcrPB/u3ACgDbGVdJ6D8+owgN09TOJjUPqJ+1q/GnDg=; b=Os7e1pr0caHY2klblJ3wNkF1Zdk8usWhBzvwf680YyMEjzhHtqDTxpQYvfDNdjHkeG FEwtXSFD0dO+tImQ078aFzs5rk8B5eXcOQTqu0BLUs/ajvHrNrNC7st3xX/jND/Lmij0 /6zUaXeC4P2vTCN05hYMj+QEM0mqarWQqAq41JGfLFgr0lXPXJkUdXlYEYVgCsU+oiq+ dMMqoodNaSJv/JUnrYnvXZnRW2dIT7t4J1Z3ne94LKguZOUamRL0/J/87EUKF0rLUJz7 GVdqEcAMezXNw5ibn+f2D5eh2uFP/ia2jJ6znuoCmEkfauZqtn2AUCBYzAJVl5H3W+Su y5AQ== 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:mime-version :content-transfer-encoding; bh=CcrPB/u3ACgDbGVdJ6D8+owgN09TOJjUPqJ+1q/GnDg=; b=hsPYEzXwPw6lTOVIV/GmmAV1Ogo7qwyt4NuaI9X6CDRhQR7fSdULsHiKP5fUoDwOx0 9ToeTrhTrc7tKvksqr1hna9sEGAobsjMh7hKNNDFOR9FVlB0eOuyDtMdX3FaCFVHuGBT M3BE4bnQmEUGoQphg2zAKVfxaAekGusE1nenTsENdkcYNfgBu89oaHlkgS9ywwtzpFGF oiwxOPP6ZCtCgRVlRovwRzY1syf2F9NBL0yYI8+Uz/m+sUkoBIfqYZq+y4hPqQUVFPZE d+rYCV6dg7V8norGP5uDv1ExzrS8LdIfWTtzNbPhkiCkiLcGjg/yJ74T/tFaugMNLIW7 bjBQ== X-Gm-Message-State: AOAM530QrKyDLVXFVk35aEjl6MgH+B7D2wOTp8LmsPU3nd0I4Liuud2i 6eAbLzwyPe8hSKfDPmvyY7k= X-Google-Smtp-Source: ABdhPJxqWtVWJfFUQYrABSADG4W5DQobHTzVnDZI5AcP33Sjaf/7fmEyjBck+sQr9r0ga/cw1kUqMw== X-Received: by 2002:a17:902:b218:b029:11a:bf7b:1a80 with SMTP id t24-20020a170902b218b029011abf7b1a80mr2402832plr.82.1628866378659; Fri, 13 Aug 2021 07:52:58 -0700 (PDT) Received: from WRT-WX9.. ([141.164.41.4]) by smtp.gmail.com with ESMTPSA id q11sm2490535pfk.32.2021.08.13.07.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 07:52:58 -0700 (PDT) From: Changbin Du To: Andrew Morton Cc: Catalin Marinas , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Changbin Du Subject: [PATCH] mm: in_irq() cleanup Date: Fri, 13 Aug 2021 22:52:45 +0800 Message-Id: <20210813145245.86070-1-changbin.du@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Os7e1pr0; spf=pass (imf02.hostedemail.com: domain of changbindu@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=changbindu@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A2CF47001775 X-Stat-Signature: yghpthruzt5pzjps864gmwz9uhbyi6ma X-HE-Tag: 1628866379-854861 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Replace the obsolete and ambiguos macro in_irq() with new macro in_hardirq(). Signed-off-by: Changbin Du --- mm/highmem.c | 2 +- mm/kmemleak.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/highmem.c b/mm/highmem.c index 4fb51d735aa6..4212ad0e4a19 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -436,7 +436,7 @@ EXPORT_SYMBOL(zero_user_segments); =20 static inline int kmap_local_idx_push(void) { - WARN_ON_ONCE(in_irq() && !irqs_disabled()); + WARN_ON_ONCE(in_hardirq() && !irqs_disabled()); current->kmap_ctrl.idx +=3D KM_INCR; BUG_ON(current->kmap_ctrl.idx >=3D KM_MAX_IDX); return current->kmap_ctrl.idx - 1; diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 228a2fbe0657..98d0be54628d 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -598,7 +598,7 @@ static struct kmemleak_object *create_object(unsigned= long ptr, size_t size, object->checksum =3D 0; =20 /* task information */ - if (in_irq()) { + if (in_hardirq()) { object->pid =3D 0; strncpy(object->comm, "hardirq", sizeof(object->comm)); } else if (in_serving_softirq()) { --=20 2.30.2