Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2228800/?format=api
{ "id": 2228800, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2228800/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260427122742.210074-2-mkchauras@gmail.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/1.1/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/" }, "msgid": "<20260427122742.210074-2-mkchauras@gmail.com>", "date": "2026-04-27T12:27:35", "name": "[v5,1/8] powerpc: rename arch_irq_disabled_regs", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ee66c7251391377f201a283270779f7f93cd985e", "submitter": { "id": 92575, "url": "http://patchwork.ozlabs.org/api/1.1/people/92575/?format=api", "name": "Mukesh Kumar Chaurasiya", "email": "mkchauras@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260427122742.210074-2-mkchauras@gmail.com/mbox/", "series": [ { "id": 501638, "url": "http://patchwork.ozlabs.org/api/1.1/series/501638/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=501638", "date": "2026-04-27T12:27:34", "name": "Generic IRQ entry/exit support for powerpc", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/501638/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2228800/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2228800/checks/", "tags": {}, "headers": { "Return-Path": "\n <linuxppc-dev+bounces-20160-incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=JlfdfJX+;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-20160-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=\"2607:f8b0:4864:20::529\"", "lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com", "lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=JlfdfJX+;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com\n (client-ip=2607:f8b0:4864:20::529; helo=mail-pg1-x529.google.com;\n envelope-from=mkchauras@gmail.com; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1 raw public key)\n server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g42sV2czDz1yHv\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 27 Apr 2026 22:28:14 +1000 (AEST)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4g42sV1rNJz2yGX;\n\tMon, 27 Apr 2026 22:28:14 +1000 (AEST)", "from mail-pg1-x529.google.com (mail-pg1-x529.google.com\n [IPv6:2607:f8b0:4864:20::529])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4g42sT09H9z2y2B\n\tfor <linuxppc-dev@lists.ozlabs.org>; Mon, 27 Apr 2026 22:28:13 +1000 (AEST)", "by mail-pg1-x529.google.com with SMTP id\n 41be03b00d2f7-c6dd5b01e14so3472155a12.0\n for <linuxppc-dev@lists.ozlabs.org>;\n Mon, 27 Apr 2026 05:28:12 -0700 (PDT)", "from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.ibm.com ([129.41.58.4])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-82f8e9f7735sm32733466b3a.21.2026.04.27.05.27.58\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 27 Apr 2026 05:28:10 -0700 (PDT)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1777292894;\n\tcv=none;\n b=bfxZR015lXXUXGlxufuy/hDHFO7VdcoHGq+fMLr0HDe6MXzG057QOg3XKvt5SCW/E0F7JeSj/pn2GCYg/D08L5iXyLGopZ8fzCsOt8V17rH3PSbYGhfvxx89/aVeO7++5JGeMAZtYSSQDxHH8mMh9ehAKJUDGQ06tn9yfxrVgtG3SFQL8BH0njNJs3BipB30edki646gR4xwGsZOoLHxK8GiK7u0cixX2efV5+fcbkzfrOtiQB6VCEEfcBwF5JjX9L4cTGa5NfQnRjarsUXR3+1tS2ErflwSfg/qCv7QFPHjvBIBhk0ZMSQEUztPKqdRtTO4YTznoMZB6ZLQ7iwWCw==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1777292894; c=relaxed/relaxed;\n\tbh=V3Ix8yVWPzMNREGKmrAx0G5cLQ0OeAzIGo9ilHfqR+E=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=ecUVBBK3OCUoa6eaQxWMTwH2yvuqzKveB4RmcexX2neuzuDImxnIhILVndUGKxJYZVeUhet+rYcFZjdlVPGodUUXiFdq/bI4yAkImdAYhC+otdBjC3qcQw99ZAyxqZS1RJOxstCdh871xjc36ZQ2IdRfgYh0X6JQvcwuFGmPBl+9DWN0HgIOSB8brKw3nGZpBEgzKSyu/mi+BlQ7e7eMzhvT+V6Pt9r4cy/NQaK8u//rJiKv2oB3Fuj+VlBVS44ED174y+D3oLH0xDuuGYOnqz2oFEMgbpecqkFE24OwhSI+6iyv99cEZsqkBE8T1VKH/wuBAnU5NNwxlUkOtcICUQ==", "ARC-Authentication-Results": "i=1; lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com; dkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=JlfdfJX+; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::529; helo=mail-pg1-x529.google.com;\n envelope-from=mkchauras@gmail.com;\n receiver=lists.ozlabs.org) smtp.mailfrom=gmail.com", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1777292891; x=1777897691;\n darn=lists.ozlabs.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=V3Ix8yVWPzMNREGKmrAx0G5cLQ0OeAzIGo9ilHfqR+E=;\n b=JlfdfJX+BFv5n0mw4x5htuS2UJwUdnP1/uku0hz/+peBoZ6lCItLm6LyfKExHDVAsK\n eHw7Hp4LCK8PbxgV1qOsWclbv4QpP2F3dBKYC+2ZqSD1BKrgdEvhekkFMr38dLTWrB3P\n qmog/6yVVv2sWb5p5M3ivX9T3n7oeZJTgZl+bR+SMVLVXImiuSZYUkmzyGtEC6+yJNZ9\n EFUM3dahyZxfyu+nr6oL9qkcce1Di+TgpzfT8c5qIzqmOgGaPzHZqX8mXdUheSBfXzd+\n jgAsaOfM4yBNwekNWzURHdTj/QWbQKlmrqzdkVW6RwEENoan29bkwwJXyKaUQ/4JcVex\n R+Cw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777292891; x=1777897691;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=V3Ix8yVWPzMNREGKmrAx0G5cLQ0OeAzIGo9ilHfqR+E=;\n b=mT4KLxbFHqg7MfFpn1tCjqqHuXDbueZMMvq1PF8JtG5LjjAfM64lIcneNU4xlIv1dx\n ba5RaWfJGtaU96MVM8euUG0A5dn38yv1xcxySHp/4zm4SW8iEz6BEwA8Zpi7TDGybIcJ\n IJksiYr2Ms5njEr1xhlo1nTE0/YSQQwAP0a6biYvL8dr9JeOpmmCx3mYDUxLOWNP2gIP\n M2hQUiWOKvJid/GpCFWnTjtC5yMokUhMOqxOy0ISYBjKSyP8ugyR6IE0GibC16G8pf81\n rkdh/dpd8JUzvmEpFnMpCgqKS2AsV3ofQWkKwetD+56Q4PLtOE8I2w2H8BA2OmpMlUcH\n c5aw==", "X-Forwarded-Encrypted": "i=1;\n AFNElJ+uMZTgEvD2KKkv99XZ7unGmu9+odY75fSQR4FGg6SRhnSRL5Y1c6ndLmR4PydAVNODKzIdQP65BpA+48c=@lists.ozlabs.org", "X-Gm-Message-State": "AOJu0YzCB78rHcFE2yQKBk5g+nIedty3yZ0V2iQLfg4r71SQj4wLLjoB\n\tnhJR3eeIVc7aLKhQmdqsa3NjPAKTn4/gy1Dzd9ITSFRlOVb3vFhCikyb", "X-Gm-Gg": "AeBDietHoBlcGcV2NPnjVExAFRRIpPZLLkTik7VaANIM/ss/PyTwus0pTv1lM+vZe2W\n\t3bY/zkDO+QSHC/UhWWW3Q8fW2ZAhKId1vw5tMrqh06plbCBAkIJM//cqbBAXbAP0+T28IVZLN2f\n\tCHzmsKnVFYFOMux/FR7/BrOwRIELEITg5cJYmXcTt4vFgc1nQWD6L/utCePCG0oLprlvQkkVZU5\n\tCTKLIN5cnab5fyyZ3JkaYeqgOvvAvVXaC8T0X/F22ZudiapL7CM2yffDhy6JEKScEr0wbPas4x8\n\tZ4JwqRblaP4inOrWCGDFxNaonapYIG4JxRD2vvFrilbNaTU3qLtt8XVnqmLx7As/0W27cfjRXUU\n\tOftSLRcbAPiFE5Ums2dPCLGxpmB9Hq1hs3YfDXZKLS0Joi/IJDkDPJaAxadFfDdrZeQvjwiTmvq\n\tildD31QUUqicvfSMNnRbX4Wp70x4P3oiesQjICqbfVC0nUFEme8wLyWRaFE1PZdic5d3y9FfujW\n\t3rQpw==", "X-Received": "by 2002:a05:6a00:4b01:b0:82f:390a:69df with SMTP id\n d2e1a72fcca58-82f8c8d616emr45497999b3a.35.1777292891062;\n Mon, 27 Apr 2026 05:28:11 -0700 (PDT)", "From": "\"Mukesh Kumar Chaurasiya (IBM)\" <mkchauras@gmail.com>", "To": "maddy@linux.ibm.com,\n\tmpe@ellerman.id.au,\n\tnpiggin@gmail.com,\n\tchleroy@kernel.org,\n\tryabinin.a.a@gmail.com,\n\tglider@google.com,\n\tandreyknvl@gmail.com,\n\tdvyukov@google.com,\n\tvincenzo.frascino@arm.com,\n\toleg@redhat.com,\n\tkees@kernel.org,\n\tluto@amacapital.net,\n\twad@chromium.org,\n\tmchauras@linux.ibm.com,\n\tsshegde@linux.ibm.com,\n\tthuth@redhat.com,\n\truanjinjie@huawei.com,\n\takpm@linux-foundation.org,\n\tmacro@orcam.me.uk,\n\tldv@strace.io,\n\tcharlie@rivosinc.com,\n\tdeller@gmx.de,\n\tkevin.brodsky@arm.com,\n\tritesh.list@gmail.com,\n\tyeoreum.yun@arm.com,\n\tagordeev@linux.ibm.com,\n\tsegher@kernel.crashing.org,\n\tmark.rutland@arm.com,\n\tryan.roberts@arm.com,\n\tpmladek@suse.com,\n\tfeng.tang@linux.alibaba.com,\n\tpeterz@infradead.org,\n\tkan.liang@linux.intel.com,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-kernel@vger.kernel.org,\n\tkasan-dev@googlegroups.com", "Cc": "Samir M <samir@linux.ibm.com>,\n\tDavid Gow <davidgow@google.com>,\n\tVenkat Rao Bagalkote <venkat88@linux.ibm.com>", "Subject": "[PATCH v5 1/8] powerpc: rename arch_irq_disabled_regs", "Date": "Mon, 27 Apr 2026 17:57:35 +0530", "Message-ID": "<20260427122742.210074-2-mkchauras@gmail.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260427122742.210074-1-mkchauras@gmail.com>", "References": "<20260427122742.210074-1-mkchauras@gmail.com>", "X-Mailing-List": "linuxppc-dev@lists.ozlabs.org", "List-Id": "<linuxppc-dev.lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev+help@lists.ozlabs.org>", "List-Owner": "<mailto:linuxppc-dev+owner@lists.ozlabs.org>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Archive": "<https://lore.kernel.org/linuxppc-dev/>,\n <https://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Subscribe": "<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>", "List-Unsubscribe": "<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>", "Precedence": "list", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Spam-Status": "No, score=-0.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tDKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,\n\tSPF_HELO_NONE,SPF_PASS autolearn=disabled version=4.0.1 OzLabs 8", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org" }, "content": "From: Mukesh Kumar Chaurasiya <mchauras@linux.ibm.com>\n\nRename arch_irq_disabled_regs() to regs_irqs_disabled() to align with the\nnaming used in the generic irqentry framework. This makes the function\navailable for use both in the PowerPC architecture code and in the\ncommon entry/exit paths shared with other architectures.\n\nThis is a preparatory change for enabling the generic irqentry framework\non PowerPC.\n\nSigned-off-by: Mukesh Kumar Chaurasiya <mchauras@linux.ibm.com>\nReviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>\nReviewed-by: Jinjie Ruan <ruanjinjie@huawei.com>\nTested-by: Samir M <samir@linux.ibm.com>\nTested-by: David Gow <davidgow@google.com>\nTested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>\n---\n arch/powerpc/include/asm/hw_irq.h | 4 ++--\n arch/powerpc/include/asm/interrupt.h | 16 ++++++++--------\n arch/powerpc/kernel/interrupt.c | 4 ++--\n arch/powerpc/kernel/syscall.c | 2 +-\n arch/powerpc/kernel/traps.c | 2 +-\n arch/powerpc/kernel/watchdog.c | 2 +-\n arch/powerpc/perf/core-book3s.c | 2 +-\n 7 files changed, 16 insertions(+), 16 deletions(-)", "diff": "diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h\nindex 9cd945f2acaf..b7eee6385ae5 100644\n--- a/arch/powerpc/include/asm/hw_irq.h\n+++ b/arch/powerpc/include/asm/hw_irq.h\n@@ -393,7 +393,7 @@ static inline void do_hard_irq_enable(void)\n \t__hard_irq_enable();\n }\n \n-static inline bool arch_irq_disabled_regs(struct pt_regs *regs)\n+static inline bool regs_irqs_disabled(struct pt_regs *regs)\n {\n \treturn (regs->softe & IRQS_DISABLED);\n }\n@@ -466,7 +466,7 @@ static inline bool arch_irqs_disabled(void)\n \n #define hard_irq_disable()\t\tarch_local_irq_disable()\n \n-static inline bool arch_irq_disabled_regs(struct pt_regs *regs)\n+static inline bool regs_irqs_disabled(struct pt_regs *regs)\n {\n \treturn !(regs->msr & MSR_EE);\n }\ndiff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h\nindex eb0e4a20b818..0e2cddf8bd21 100644\n--- a/arch/powerpc/include/asm/interrupt.h\n+++ b/arch/powerpc/include/asm/interrupt.h\n@@ -172,7 +172,7 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)\n \t/* Enable MSR[RI] early, to support kernel SLB and hash faults */\n #endif\n \n-\tif (!arch_irq_disabled_regs(regs))\n+\tif (!regs_irqs_disabled(regs))\n \t\ttrace_hardirqs_off();\n \n \tif (user_mode(regs)) {\n@@ -192,11 +192,11 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)\n \t\t\tCT_WARN_ON(ct_state() != CT_STATE_KERNEL &&\n \t\t\t\t ct_state() != CT_STATE_IDLE);\n \t\tINT_SOFT_MASK_BUG_ON(regs, is_implicit_soft_masked(regs));\n-\t\tINT_SOFT_MASK_BUG_ON(regs, arch_irq_disabled_regs(regs) &&\n-\t\t\t\t\t search_kernel_restart_table(regs->nip));\n+\t\tINT_SOFT_MASK_BUG_ON(regs, regs_irqs_disabled(regs) &&\n+\t\t\t\t search_kernel_restart_table(regs->nip));\n \t}\n-\tINT_SOFT_MASK_BUG_ON(regs, !arch_irq_disabled_regs(regs) &&\n-\t\t\t\t !(regs->msr & MSR_EE));\n+\tINT_SOFT_MASK_BUG_ON(regs, !regs_irqs_disabled(regs) &&\n+\t\t\t !(regs->msr & MSR_EE));\n \n \tbooke_restore_dbcr0();\n }\n@@ -298,7 +298,7 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte\n \t\t * Adjust regs->softe to be soft-masked if it had not been\n \t\t * reconcied (e.g., interrupt entry with MSR[EE]=0 but softe\n \t\t * not yet set disabled), or if it was in an implicit soft\n-\t\t * masked state. This makes arch_irq_disabled_regs(regs)\n+\t\t * masked state. This makes regs_irqs_disabled(regs)\n \t\t * behave as expected.\n \t\t */\n \t\tregs->softe = IRQS_ALL_DISABLED;\n@@ -372,7 +372,7 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter\n \n #ifdef CONFIG_PPC64\n #ifdef CONFIG_PPC_BOOK3S\n-\tif (arch_irq_disabled_regs(regs)) {\n+\tif (regs_irqs_disabled(regs)) {\n \t\tunsigned long rst = search_kernel_restart_table(regs->nip);\n \t\tif (rst)\n \t\t\tregs_set_return_ip(regs, rst);\n@@ -661,7 +661,7 @@ void replay_soft_interrupts(void);\n \n static inline void interrupt_cond_local_irq_enable(struct pt_regs *regs)\n {\n-\tif (!arch_irq_disabled_regs(regs))\n+\tif (!regs_irqs_disabled(regs))\n \t\tlocal_irq_enable();\n }\n \ndiff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c\nindex e63bfde13e03..666eadb589a5 100644\n--- a/arch/powerpc/kernel/interrupt.c\n+++ b/arch/powerpc/kernel/interrupt.c\n@@ -347,7 +347,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs)\n \tunsigned long ret;\n \n \tBUG_ON(regs_is_unrecoverable(regs));\n-\tBUG_ON(arch_irq_disabled_regs(regs));\n+\tBUG_ON(regs_irqs_disabled(regs));\n \tCT_WARN_ON(ct_state() == CT_STATE_USER);\n \n \t/*\n@@ -396,7 +396,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs)\n \n \tlocal_irq_disable();\n \n-\tif (!arch_irq_disabled_regs(regs)) {\n+\tif (!regs_irqs_disabled(regs)) {\n \t\t/* Returning to a kernel context with local irqs enabled. */\n \t\tWARN_ON_ONCE(!(regs->msr & MSR_EE));\n again:\ndiff --git a/arch/powerpc/kernel/syscall.c b/arch/powerpc/kernel/syscall.c\nindex b762677f8737..52d6e10eab22 100644\n--- a/arch/powerpc/kernel/syscall.c\n+++ b/arch/powerpc/kernel/syscall.c\n@@ -32,7 +32,7 @@ notrace long system_call_exception(struct pt_regs *regs, unsigned long r0)\n \n \tBUG_ON(regs_is_unrecoverable(regs));\n \tBUG_ON(!user_mode(regs));\n-\tBUG_ON(arch_irq_disabled_regs(regs));\n+\tBUG_ON(regs_irqs_disabled(regs));\n \n #ifdef CONFIG_PPC_PKEY\n \tif (mmu_has_feature(MMU_FTR_PKEY)) {\ndiff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c\nindex cb8e9357383e..629f2a2d4780 100644\n--- a/arch/powerpc/kernel/traps.c\n+++ b/arch/powerpc/kernel/traps.c\n@@ -1956,7 +1956,7 @@ DEFINE_INTERRUPT_HANDLER_RAW(performance_monitor_exception)\n \t * prevent hash faults on user addresses when reading callchains (and\n \t * looks better from an irq tracing perspective).\n \t */\n-\tif (IS_ENABLED(CONFIG_PPC64) && unlikely(arch_irq_disabled_regs(regs)))\n+\tif (IS_ENABLED(CONFIG_PPC64) && unlikely(regs_irqs_disabled(regs)))\n \t\tperformance_monitor_exception_nmi(regs);\n \telse\n \t\tperformance_monitor_exception_async(regs);\ndiff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c\nindex 764001deb060..c40c69368476 100644\n--- a/arch/powerpc/kernel/watchdog.c\n+++ b/arch/powerpc/kernel/watchdog.c\n@@ -376,7 +376,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)\n \tu64 tb;\n \n \t/* should only arrive from kernel, with irqs disabled */\n-\tWARN_ON_ONCE(!arch_irq_disabled_regs(regs));\n+\tWARN_ON_ONCE(!regs_irqs_disabled(regs));\n \n \tif (!cpumask_test_cpu(cpu, &wd_cpus_enabled))\n \t\treturn 0;\ndiff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c\nindex 8b0081441f85..f7518b7e3055 100644\n--- a/arch/powerpc/perf/core-book3s.c\n+++ b/arch/powerpc/perf/core-book3s.c\n@@ -2482,7 +2482,7 @@ static void __perf_event_interrupt(struct pt_regs *regs)\n \t * will trigger a PMI after waking up from idle. Since counter values are _not_\n \t * saved/restored in idle path, can lead to below \"Can't find PMC\" message.\n \t */\n-\tif (unlikely(!found) && !arch_irq_disabled_regs(regs))\n+\tif (unlikely(!found) && !regs_irqs_disabled(regs))\n \t\tprintk_ratelimited(KERN_WARNING \"Can't find PMC that caused IRQ\\n\");\n \n \t/*\n", "prefixes": [ "v5", "1/8" ] }