From: tip-bot for Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
konrad.wilk@oracle.com, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/iommu] x86, iommu: Update header comments with appropriate naming
Date: Fri, 8 Oct 2010 20:13:21 GMT [thread overview]
Message-ID: <tip-6e9636693373d938aa3b13427be3d212f172ac06@git.kernel.org> (raw)
In-Reply-To: <1286564028-2352-3-git-send-email-konrad.wilk@oracle.com>
Commit-ID: 6e9636693373d938aa3b13427be3d212f172ac06
Gitweb: http://git.kernel.org/tip/6e9636693373d938aa3b13427be3d212f172ac06
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
AuthorDate: Fri, 8 Oct 2010 14:53:48 -0400
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Fri, 8 Oct 2010 13:11:21 -0700
x86, iommu: Update header comments with appropriate naming
The header comments diverged a bit from the implementation. Lets
re-sync them.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
LKML-Reference: <1286564028-2352-3-git-send-email-konrad.wilk@oracle.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/include/asm/iommu_table.h | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/iommu_table.h b/arch/x86/include/asm/iommu_table.h
index df55a78..f229b13 100644
--- a/arch/x86/include/asm/iommu_table.h
+++ b/arch/x86/include/asm/iommu_table.h
@@ -1,4 +1,3 @@
-
#ifndef _ASM_X86_IOMMU_TABLE_H
#define _ASM_X86_IOMMU_TABLE_H
@@ -60,7 +59,7 @@ struct iommu_table_entry {
* and it will be run after the SWIOTLB and the other IOMMUs
* that utilize this macro. If the IOMMU is detected (ie, the
* detect routine returns a positive value), the other IOMMUs
- * are also checked. You can use IOMMU_INIT_FINISH if you prefer
+ * are also checked. You can use IOMMU_INIT_POST_FINISH if you prefer
* to stop detecting the other IOMMUs after yours has been detected.
*/
#define IOMMU_INIT_POST(_detect) \
@@ -80,9 +79,9 @@ struct iommu_table_entry {
* d). Similar to the 'init', except that this gets called from pci_iommu_init
* where we do have a memory allocator.
*
- * The _CONT vs the _EXIT differs in that the _CONT variant will
+ * The standard vs the _FINISH differs in that the _FINISH variant will
* continue detecting other IOMMUs in the call list after the
- * the detection routine returns a positive number. The _EXIT will
+ * the detection routine returns a positive number. The _FINISH will
* stop the execution chain. Both will still call the 'init' and
* 'late_init' functions if they are set.
*/
prev parent reply other threads:[~2010-10-08 20:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 18:53 [PATCH] x86/ia64/iommu: Bugfixes to IOMMU_INIT macros and its friends Konrad Rzeszutek Wilk
2010-10-08 18:53 ` [PATCH 1/2] ia64/iommu: Add a dummy iommu_table.h file in IA64 Konrad Rzeszutek Wilk
2010-10-08 20:13 ` [tip:x86/iommu] ia64, iommu: " tip-bot for Konrad Rzeszutek Wilk
2010-10-08 18:53 ` [PATCH 2/2] x86/iommu: Update header comments with appropriate naming Konrad Rzeszutek Wilk
2010-10-08 20:13 ` tip-bot for Konrad Rzeszutek Wilk [this message]
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=tip-6e9636693373d938aa3b13427be3d212f172ac06@git.kernel.org \
--to=konrad.wilk@oracle.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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
Powered by JetHome