From patchwork Fri Oct 18 12:48:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Julien Panis X-Patchwork-Id: 11198413 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA96013BD for ; Fri, 18 Oct 2019 13:07:36 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FF622070B for ; Fri, 18 Oct 2019 13:07:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FF622070B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLRw4-0000rf-Kn; Fri, 18 Oct 2019 13:04:52 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLRgF-0007me-OF for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 12:48:31 +0000 X-Inumbo-ID: 94295f06-f1a5-11e9-beca-bc764e2007e4 Received: from Galois.linutronix.de (unknown [2a0a:51c0:0:12e:550::1]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 94295f06-f1a5-11e9-beca-bc764e2007e4; Fri, 18 Oct 2019 12:48:27 +0000 (UTC) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1iLRg3-00078X-N5; Fri, 18 Oct 2019 14:48:19 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 477681C009C; Fri, 18 Oct 2019 14:48:19 +0200 (CEST) Date: Fri, 18 Oct 2019 12:48:19 -0000 From: "tip-bot2 for Masami Hiramatsu" To: linux-tip-commits@vger.kernel.org In-Reply-To: <156777562873.25081.2288083344657460959.stgit@devnote2> References: <156777562873.25081.2288083344657460959.stgit@devnote2> MIME-Version: 1.0 Message-ID: <157140289913.29376.11199090886356756663.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 X-Mailman-Approved-At: Fri, 18 Oct 2019 13:04:51 +0000 Subject: [Xen-devel] [tip: x86/core] x86/asm: Allow to pass macros to __ASM_FORM() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: linux-kernel@vger.kernel.org Cc: Juergen Gross , Stefano Stabellini , "Peter Zijlstra \(Intel\)" , Andrew Cooper , x86@kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Masami Hiramatsu , Josh Poimboeuf , xen-devel@lists.xenproject.org, Boris Ostrovsky , Randy Dunlap , Ingo Molnar Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The following commit has been merged into the x86/core branch of tip: Commit-ID: f7919fd943abf0c77aed4441ea9897a323d132f5 Gitweb: https://git.kernel.org/tip/f7919fd943abf0c77aed4441ea9897a323d132f5 Author: Masami Hiramatsu AuthorDate: Fri, 06 Sep 2019 22:13:48 +09:00 Committer: Peter Zijlstra CommitterDate: Thu, 17 Oct 2019 21:31:57 +02:00 x86/asm: Allow to pass macros to __ASM_FORM() Use __stringify() at __ASM_FORM() so that user can pass code including macros to __ASM_FORM(). Signed-off-by: Masami Hiramatsu Signed-off-by: Peter Zijlstra (Intel) Cc: Juergen Gross Cc: x86@kernel.org Cc: Boris Ostrovsky Cc: Ingo Molnar Cc: Stefano Stabellini Cc: Andrew Cooper Cc: Borislav Petkov Cc: xen-devel@lists.xenproject.org Cc: Randy Dunlap Cc: Josh Poimboeuf Link: https://lkml.kernel.org/r/156777562873.25081.2288083344657460959.stgit@devnote2 --- arch/x86/include/asm/asm.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 3ff577c..1b563f9 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -7,9 +7,11 @@ # define __ASM_FORM_RAW(x) x # define __ASM_FORM_COMMA(x) x, #else -# define __ASM_FORM(x) " " #x " " -# define __ASM_FORM_RAW(x) #x -# define __ASM_FORM_COMMA(x) " " #x "," +#include + +# define __ASM_FORM(x) " " __stringify(x) " " +# define __ASM_FORM_RAW(x) __stringify(x) +# define __ASM_FORM_COMMA(x) " " __stringify(x) "," #endif #ifndef __x86_64__