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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 D9ED1C76191 for ; Wed, 24 Jul 2019 19:57:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFEDD214AF for ; Wed, 24 Jul 2019 19:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998273; bh=OCAWUr3mFL5eDNWwXHfGhmryRAQg6yZrfx5cYtqBmug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VHlLJ25mpSvsBa6GY4YBP7loxSd4m9m4fKCHVR6Ei3Hi7xzb2v+UatmJmyGkeMf5h 8iIttLgpZ9M0DnudSqJT+79DIKHJmmUgS8PqYEEijgWKdiMqgJrNBdWr19D13sQhJD YcbqExKYwUgbg5eVv1/vtNVKc+djqsaIMHMu7qsk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392122AbfGXT5w (ORCPT ); Wed, 24 Jul 2019 15:57:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:43708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392107AbfGXT5v (ORCPT ); Wed, 24 Jul 2019 15:57:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7347D22BED; Wed, 24 Jul 2019 19:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998270; bh=OCAWUr3mFL5eDNWwXHfGhmryRAQg6yZrfx5cYtqBmug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sog8bEWVZh39TW/DmaG3ak+NZdbpWCu/zZND3vm1609W2OcoHcgkQJLhDluOoxjfZ E+xGeKaJ18joqfN2a7vtYoRCz/SgsOiIJjZRdm+MC9a6h949WFegA1UE/k2alpK6ks J6HmTaFkTog/Dyx0GT16VrA0mR8JU5ULHPavUdc0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier , Will Deacon , Mark Rutland , Julien Thierry , Catalin Marinas Subject: [PATCH 5.1 307/371] arm64: irqflags: Add condition flags to inline asm clobber list Date: Wed, 24 Jul 2019 21:20:59 +0200 Message-Id: <20190724191747.282263359@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Julien Thierry commit f57065782f245ca96f1472209a485073bbc11247 upstream. Some of the inline assembly instruction use the condition flags and need to include "cc" in the clobber list. Fixes: 4a503217ce37 ("arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking") Cc: # 5.1.x- Suggested-by: Marc Zyngier Cc: Will Deacon Reviewed-by: Marc Zyngier Acked-by: Mark Rutland Signed-off-by: Julien Thierry Signed-off-by: Catalin Marinas Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/irqflags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm64/include/asm/irqflags.h +++ b/arch/arm64/include/asm/irqflags.h @@ -92,7 +92,7 @@ static inline unsigned long arch_local_s ARM64_HAS_IRQ_PRIO_MASKING) : "=&r" (flags), "+r" (daif_bits) : "r" ((unsigned long) GIC_PRIO_IRQOFF) - : "memory"); + : "cc", "memory"); return flags; } @@ -136,7 +136,7 @@ static inline int arch_irqs_disabled_fla ARM64_HAS_IRQ_PRIO_MASKING) : "=&r" (res) : "r" ((int) flags) - : "memory"); + : "cc", "memory"); return res; }