diff options
Diffstat (limited to 'mm/highmem.c')
-rw-r--r-- | mm/highmem.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 09fc744..693394d 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -17,7 +17,7 @@ */ #include <linux/mm.h> -#include <linux/export.h> +#include <linux/module.h> #include <linux/swap.h> #include <linux/bio.h> #include <linux/pagemap.h> @@ -94,19 +94,6 @@ static DECLARE_WAIT_QUEUE_HEAD(pkmap_map_wait); do { spin_unlock(&kmap_lock); (void)(flags); } while (0) #endif -struct page *kmap_to_page(void *vaddr) -{ - unsigned long addr = (unsigned long)vaddr; - - if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) { - int i = (addr - PKMAP_ADDR(0)) >> PAGE_SHIFT; - return pte_page(pkmap_page_table[i]); - } - - return virt_to_page(addr); -} -EXPORT_SYMBOL(kmap_to_page); - static void flush_all_zero_pkmaps(void) { int i; @@ -263,7 +250,7 @@ void *kmap_high_get(struct page *page) #endif /** - * kunmap_high - unmap a highmem page into memory + * kunmap_high - map a highmem page into memory * @page: &struct page to unmap * * If ARCH_NEEDS_KMAP_HIGH_GET is not defined then this may be called @@ -339,7 +326,7 @@ static struct page_address_slot { spinlock_t lock; /* Protect this bucket's list */ } ____cacheline_aligned_in_smp page_address_htable[1<<PA_HASH_ORDER]; -static struct page_address_slot *page_slot(const struct page *page) +static struct page_address_slot *page_slot(struct page *page) { return &page_address_htable[hash_ptr(page, PA_HASH_ORDER)]; } @@ -350,7 +337,7 @@ static struct page_address_slot *page_slot(const struct page *page) * * Returns the page's virtual address. */ -void *page_address(const struct page *page) +void *page_address(struct page *page) { unsigned long flags; void *ret; |