From ef9629e172a3378b16f5caf496fb08a0e9760a10 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Thu, 28 Oct 2010 10:14:41 -0500 Subject: [PATCH] --- yaml --- r: 218915 b: refs/heads/master c: 765aaafe38050790301e89745b991dbdf3dded4c h: refs/heads/master i: 218913: 7db542e3edf98395df34d7dbc5d076540504c8f4 218911: 1fc47506f9bc5a39e875ca8696d4b2f13b7a326b v: v3 --- [refs] | 2 +- trunk/arch/parisc/include/asm/cacheflush.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a5b7ce3e989e..6a24bf9de01e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b31d42a5af1818bdf31a5f023abe4d8b212542f2 +refs/heads/master: 765aaafe38050790301e89745b991dbdf3dded4c diff --git a/trunk/arch/parisc/include/asm/cacheflush.h b/trunk/arch/parisc/include/asm/cacheflush.h index dba11aedce1b..f388a85bba11 100644 --- a/trunk/arch/parisc/include/asm/cacheflush.h +++ b/trunk/arch/parisc/include/asm/cacheflush.h @@ -126,20 +126,20 @@ static inline void *kmap(struct page *page) #define kunmap(page) kunmap_parisc(page_address(page)) -static inline void *kmap_atomic(struct page *page, enum km_type idx) +static inline void *__kmap_atomic(struct page *page) { pagefault_disable(); return page_address(page); } -static inline void kunmap_atomic_notypecheck(void *addr, enum km_type idx) +static inline void __kunmap_atomic(void *addr) { kunmap_parisc(addr); pagefault_enable(); } -#define kmap_atomic_prot(page, idx, prot) kmap_atomic(page, idx) -#define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx)) +#define kmap_atomic_prot(page, prot) kmap_atomic(page) +#define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) #define kmap_atomic_to_page(ptr) virt_to_page(ptr) #endif