From: Zhen Lei <thunder.leizhen@huawei.com>
To: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>,
John Garry <john.garry@huawei.com>,
Robin Murphy <robin.murphy@arm.com>,
Will Deacon <will.deacon@arm.com>, Joerg Roedel <joro@8bytes.org>,
Jonathan Corbet <corbet@lwn.net>,
linux-doc <linux-doc@vger.kernel.org>,
Sebastian Ott <sebott@linux.ibm.com>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>,
"Martin Schwidefsky" <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
"Michael Ellerman" <mpe@ellerman.id.au>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
David Woodhouse <dwmw2@infradead.org>,
iommu <iommu@lists.linux-foundation.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-s390 <linux-s390@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
x86 <x86@kernel.org>, linux-ia64 <linux-ia64@vger.kernel.org>
Cc: Hanjun Guo <guohanjun@huawei.com>, Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH v8 2/7] x86/dma: use IS_ENABLED() to simplify the code
Date: Thu, 30 May 2019 11:48:26 +0800 [thread overview]
Message-ID: <20190530034831.4184-3-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20190530034831.4184-1-thunder.leizhen@huawei.com>
This patch removes the ifdefs around CONFIG_IOMMU_DEFAULT_PASSTHROUGH to
improve readablity.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
arch/x86/kernel/pci-dma.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index dcd272dbd0a9330..9f2b19c35a060df 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -43,11 +43,8 @@
* It is also possible to disable by default in kernel config, and enable with
* iommu=nopt at boot time.
*/
-#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH
-int iommu_pass_through __read_mostly = 1;
-#else
-int iommu_pass_through __read_mostly;
-#endif
+int iommu_pass_through __read_mostly =
+ IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH);
extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];
--
1.8.3
next prev parent reply other threads:[~2019-05-30 4:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 3:48 [PATCH v8 0/7] iommu: enhance IOMMU default DMA mode build options Zhen Lei
2019-05-30 3:48 ` [PATCH v8 1/7] " Zhen Lei
2019-05-30 12:20 ` John Garry
2019-05-31 10:03 ` Leizhen (ThunderTown)
2019-05-31 10:42 ` John Garry
2019-06-13 8:30 ` Leizhen (ThunderTown)
2019-05-30 3:48 ` Zhen Lei [this message]
2019-06-12 5:16 ` [PATCH v8 2/7] x86/dma: use IS_ENABLED() to simplify the code Borislav Petkov
2019-06-12 6:26 ` Leizhen (ThunderTown)
2019-05-30 3:48 ` [PATCH v8 3/7] s390/pci: add support for IOMMU default DMA mode build options Zhen Lei
2019-06-03 11:51 ` Sebastian Ott
2019-05-30 3:48 ` [PATCH v8 4/7] powernv/iommu: " Zhen Lei
2019-05-30 3:48 ` [PATCH v8 5/7] iommu/vt-d: " Zhen Lei
2019-05-30 3:48 ` [PATCH v8 6/7] iommu/amd: " Zhen Lei
2019-05-30 3:48 ` [PATCH v8 7/7] ia64: hide build option IOMMU_DEFAULT_PASSTHROUGH Zhen Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190530034831.4184-3-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dwmw2@infradead.org \
--cc=fenghua.yu@intel.com \
--cc=gerald.schaefer@de.ibm.com \
--cc=guohanjun@huawei.com \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe.brucker@arm.com \
--cc=john.garry@huawei.com \
--cc=joro@8bytes.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=robin.murphy@arm.com \
--cc=schwidefsky@de.ibm.com \
--cc=sebott@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).