[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-9efc31b81d740487fd204fade0913ffa8cc97fc3@git.kernel.org>
Date: Mon, 11 Jun 2012 02:13:54 -0700
From: tip-bot for Wanpeng Li <liwp@...ux.vnet.ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
liwp@...ux.vnet.ibm.com, liwp.linux@...il.com, tglx@...utronix.de,
shangw@...ux.vnet.ibm.com
Subject: [tip:x86/urgent] x86/mm: Fix some kernel-doc warnings
Commit-ID: 9efc31b81d740487fd204fade0913ffa8cc97fc3
Gitweb: http://git.kernel.org/tip/9efc31b81d740487fd204fade0913ffa8cc97fc3
Author: Wanpeng Li <liwp@...ux.vnet.ibm.com>
AuthorDate: Sun, 10 Jun 2012 10:50:52 +0800
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 11 Jun 2012 10:54:45 +0200
x86/mm: Fix some kernel-doc warnings
Fix kernel-doc warnings in arch/x86/mm/ioremap.c and
arch/x86/mm/pageattr.c, just like this one:
Warning(arch/x86/mm/ioremap.c:204):
No description found for parameter 'phys_addr'
Warning(arch/x86/mm/ioremap.c:204):
Excess function parameter 'offset' description in 'ioremap_nocache'
Signed-off-by: Wanpeng Li <liwp@...ux.vnet.ibm.com>
Cc: Gavin Shan <shangw@...ux.vnet.ibm.com>
Cc: Wanpeng Li <liwp.linux@...il.com>
Link: http://lkml.kernel.org/r/1339296652-2935-1-git-send-email-liwp.linux@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/mm/ioremap.c | 4 ++--
arch/x86/mm/pageattr.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index be1ef57..78fe3f1 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -180,7 +180,7 @@ err_free_memtype:
/**
* ioremap_nocache - map bus memory into CPU space
- * @offset: bus address of the memory
+ * @phys_addr: bus address of the memory
* @size: size of the resource to map
*
* ioremap_nocache performs a platform specific sequence of operations to
@@ -217,7 +217,7 @@ EXPORT_SYMBOL(ioremap_nocache);
/**
* ioremap_wc - map memory into CPU space write combined
- * @offset: bus address of the memory
+ * @phys_addr: bus address of the memory
* @size: size of the resource to map
*
* This version of ioremap ensures that the memory is marked write combining.
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index e1ebde3..a718e0d 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -122,7 +122,7 @@ within(unsigned long addr, unsigned long start, unsigned long end)
/**
* clflush_cache_range - flush a cache range with clflush
- * @addr: virtual start address
+ * @vaddr: virtual start address
* @size: number of bytes to flush
*
* clflush is an unordered instruction which needs fencing with mfence
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists