From patchwork Wed Jul 20 16:10:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9239909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4039E60574 for ; Wed, 20 Jul 2016 16:14:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 321B527C4B for ; Wed, 20 Jul 2016 16:14:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 268A727CCB; Wed, 20 Jul 2016 16:14:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CC71327C4B for ; Wed, 20 Jul 2016 16:14:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bPu5n-0007SB-PT; Wed, 20 Jul 2016 16:11:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bPu5m-0007S0-2B for xen-devel@lists.xen.org; Wed, 20 Jul 2016 16:11:26 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 56/40-19922-DA2AF875; Wed, 20 Jul 2016 16:11:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTXfNov5 wgxvTDC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oxns3eyF3zgqZj3VraBsYG9i5GLQ0hgE6PE hbv/2SCc04wSbyf8Zeli5ORgE9CUuPP5ExOILSIgLXHt82VGkCJmgXZGieUb/4EVCQtES0w6u R3MZhFQlei+sgKsgVfAReLSrk9sILaEgJzEyWOTWUFsTgFXifMnfzKC2EJANZvefmOewMi9gJ FhFaN6cWpRWWqRrrFeUlFmekZJbmJmjq6hgalebmpxcWJ6ak5iUrFecn7uJkagfxmAYAfj3n9 OhxglOZiURHlVRXvDhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnwLl7YHy4kWJSanlqRlpkDDDSY tAQHj5II73GQNG9xQWJucWY6ROoUo6KUOK87SEIAJJFRmgfXBgvuS4yyUsK8jECHCPEUpBblZ pagyr9iFOdgVBLmDQSZwpOZVwI3/RXQYiagxXMEwBaXJCKkpBoY7fR/LTr6WOW8j97W1JthEy /W3Qo+1SO7Nf7L0Re5r79yHFXyO6D56uZaTWG2RT/tlXx3BirxGLdNjTp2WyA7vn7eh7vlflP XfXV7b85kGnYg3r8xXuYMa+2fz0rtTN8+VcvJH1YUe3LgMb97yGSttALn7o6lD6uF2G8ceLWc b408Q7t03sOpSizFGYmGWsxFxYkA9tK7R2kCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1469031084!34668409!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14442 invoked from network); 20 Jul 2016 16:11:24 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-16.tower-206.messagelabs.com with SMTP; 20 Jul 2016 16:11:24 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9E5F93A1; Wed, 20 Jul 2016 09:12:34 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.218.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F23EB3F387; Wed, 20 Jul 2016 09:11:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 20 Jul 2016 17:10:43 +0100 Message-Id: <1469031064-23344-2-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469031064-23344-1-git-send-email-julien.grall@arm.com> References: <1469031064-23344-1-git-send-email-julien.grall@arm.com> Cc: proskurin@sec.in.tum.de, Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org, steve.capper@arm.com Subject: [Xen-devel] [PATCH 01/22] xen/arm: system: Use the correct parameter name in local_irq_restore X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The parameter to store the flags is called 'x' and not 'flags'. Thankfully all the user of the macro is passing 'flags'. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- This patch is candidate to be backported up to Xen 4.5. --- xen/include/asm-arm/arm32/system.h | 2 +- xen/include/asm-arm/arm64/system.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/arm32/system.h b/xen/include/asm-arm/arm32/system.h index b47b942..c617b40 100644 --- a/xen/include/asm-arm/arm32/system.h +++ b/xen/include/asm-arm/arm32/system.h @@ -24,7 +24,7 @@ asm volatile ( \ "msr cpsr_c, %0 @ local_irq_restore\n" \ : \ - : "r" (flags) \ + : "r" (x) \ : "memory", "cc"); \ }) diff --git a/xen/include/asm-arm/arm64/system.h b/xen/include/asm-arm/arm64/system.h index 6efced3..2e2ee21 100644 --- a/xen/include/asm-arm/arm64/system.h +++ b/xen/include/asm-arm/arm64/system.h @@ -40,7 +40,7 @@ asm volatile ( \ "msr daif, %0 // local_irq_restore" \ : \ - : "r" (flags) \ + : "r" (x) \ : "memory"); \ })