| Message ID | 517BAB83.2060308@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Helge Deller |
| Headers | show |
Zhao Hongjiang wrote:
> kmap_atomic allows only one argument now, just move the second.
Do you mean "remove"?
On 2013/4/27 19:43, Rolf Eike Beer wrote: > Zhao Hongjiang wrote: >> kmap_atomic allows only one argument now, just move the second. > > Do you mean "remove"? > yes, this should be "remove". -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/27/2013 12:42 PM, Zhao Hongjiang wrote: > kmap_atomic allows only one argument now, just move the second. > > Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com> Thanks! Queued up in parisc tree for 3.10. Helge > --- > arch/parisc/kernel/cache.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c > index 4b12890..6df734a 100644 > --- a/arch/parisc/kernel/cache.c > +++ b/arch/parisc/kernel/cache.c > @@ -609,7 +609,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr) > /* Clear using TMPALIAS region. The page doesn't need to > be flushed but the kernel mapping needs to be purged. */ > > - vto = kmap_atomic(page, KM_USER0); > + vto = kmap_atomic(page); > > /* The PA-RISC 2.0 Architecture book states on page F-6: > "Before a write-capable translation is enabled, *all* > @@ -644,8 +644,8 @@ void copy_user_highpage(struct page *to, struct page *from, > the `to' page must be flushed in copy_user_page_asm since > it can be used to bring in executable code. */ > > - vfrom = kmap_atomic(from, KM_USER0); > - vto = kmap_atomic(to, KM_USER1); > + vfrom = kmap_atomic(from); > + vto = kmap_atomic(to); > > purge_kernel_dcache_page_asm((unsigned long)vto); > purge_tlb_start(flags); > -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 4b12890..6df734a 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -609,7 +609,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr) /* Clear using TMPALIAS region. The page doesn't need to be flushed but the kernel mapping needs to be purged. */ - vto = kmap_atomic(page, KM_USER0); + vto = kmap_atomic(page); /* The PA-RISC 2.0 Architecture book states on page F-6: "Before a write-capable translation is enabled, *all* @@ -644,8 +644,8 @@ void copy_user_highpage(struct page *to, struct page *from, the `to' page must be flushed in copy_user_page_asm since it can be used to bring in executable code. */ - vfrom = kmap_atomic(from, KM_USER0); - vto = kmap_atomic(to, KM_USER1); + vfrom = kmap_atomic(from); + vto = kmap_atomic(to); purge_kernel_dcache_page_asm((unsigned long)vto); purge_tlb_start(flags);
kmap_atomic allows only one argument now, just move the second. Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com> --- arch/parisc/kernel/cache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)