From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xb4Mf0gZBzDqm7 for ; Mon, 21 Aug 2017 03:59:25 +1000 (AEST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v7KHx1cV106216 for ; Sun, 20 Aug 2017 13:59:24 -0400 Received: from e23smtp01.au.ibm.com (e23smtp01.au.ibm.com [202.81.31.143]) by mx0a-001b2d01.pphosted.com with ESMTP id 2cehdyg0rd-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Sun, 20 Aug 2017 13:59:24 -0400 Received: from localhost by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Aug 2017 03:59:21 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v7KHxJt242532984 for ; Mon, 21 Aug 2017 03:59:19 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v7KHxAro009744 for ; Mon, 21 Aug 2017 03:59:10 +1000 From: Madhavan Srinivasan To: benh@kernel.crashing.org, mpe@ellerman.id.au Cc: anton@samba.org, paulus@samba.org, npiggin@gmail.com, linuxppc-dev@lists.ozlabs.org, Madhavan Srinivasan Subject: [PATCH v10 06/14] powerpc/irq: Fix arch_local_irq_disable() in book3s Date: Sun, 20 Aug 2017 23:28:23 +0530 In-Reply-To: <1503251911-30637-1-git-send-email-maddy@linux.vnet.ibm.com> References: <1503251911-30637-1-git-send-email-maddy@linux.vnet.ibm.com> Message-Id: <1503251911-30637-7-git-send-email-maddy@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , In powerpc book3s, arch_local_irq_disable() function is not a "void" when compared to other arch. And only user for this function is arch_local_irq_save(). Patch modify the arch_local_irq_save() and makes arch_local_irq_disable() to use arch_local_irq_save() instead. Suggested-by: Nicholas Piggin Signed-off-by: Madhavan Srinivasan --- arch/powerpc/include/asm/hw_irq.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index d1ddb74fe837..85f67a4938a5 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -90,11 +90,6 @@ static inline unsigned long arch_local_save_flags(void) return soft_enabled_return(); } -static inline unsigned long arch_local_irq_disable(void) -{ - return soft_enabled_set_return(IRQ_DISABLED); -} - extern void arch_local_irq_restore(unsigned long); static inline void arch_local_irq_enable(void) @@ -104,7 +99,12 @@ static inline void arch_local_irq_enable(void) static inline unsigned long arch_local_irq_save(void) { - return arch_local_irq_disable(); + return soft_enabled_set_return(IRQ_DISABLED); +} + +static inline void arch_local_irq_disable(void) +{ + arch_local_irq_save(); } static inline bool arch_irqs_disabled_flags(unsigned long flags) -- 2.7.4