From 9a797bce23817d38b5ebd86ad585493cd23ba50d Mon Sep 17 00:00:00 2001 From: Wanpeng Li Date: Sun, 10 Jun 2012 10:50:52 +0800 Subject: [PATCH] --- yaml --- r: 310871 b: refs/heads/master c: 9efc31b81d740487fd204fade0913ffa8cc97fc3 h: refs/heads/master i: 310869: 31fa2e447254246e402b20e44fc050bbb6582c5f 310867: 1e0bac6cfbd9cdd7683ff8c6ac1ad3d94b348232 310863: b45991e353164a5f9140d7846e393ac0b0086d30 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/ioremap.c | 4 ++-- trunk/arch/x86/mm/pageattr.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e82dd8575b5c..11fefc9daecb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9271b0b4b2044c6db06051fe60bc58cdd4f17c7c +refs/heads/master: 9efc31b81d740487fd204fade0913ffa8cc97fc3 diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c index be1ef574ce9a..78fe3f1ac49f 100644 --- a/trunk/arch/x86/mm/ioremap.c +++ b/trunk/arch/x86/mm/ioremap.c @@ -180,7 +180,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, /** * 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/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c index e1ebde315210..a718e0d23503 100644 --- a/trunk/arch/x86/mm/pageattr.c +++ b/trunk/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