vserver 1.9.5.x5

[linux-2.6.git] / include / asm-ppc / highmem.h

diff --git a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
index aa3e745..7cda32e 100644 (file)
--- a/include/asm-ppc/highmem.h
+++ b/include/asm-ppc/highmem.h
@@ -56,7 +56,7 @@ extern void kunmap_high(struct page *page);
 static inline void *kmap(struct page *page)
 {
        might_sleep();
-       if (page < highmem_start_page)
+       if (!PageHighMem(page))
                return page_address(page);
        return kmap_high(page);
 }
@@ -64,7 +64,7 @@ static inline void *kmap(struct page *page)
 static inline void kunmap(struct page *page)
 {
        BUG_ON(in_interrupt());
-       if (page < highmem_start_page)
+       if (!PageHighMem(page))
                return;
        kunmap_high(page);
 }
@@ -82,7 +82,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 
        /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
        inc_preempt_count();
-       if (page < highmem_start_page)
+       if (!PageHighMem(page))
                return page_address(page);
 
        idx = type + KM_TYPE_NR*smp_processor_id();
@@ -91,7 +91,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
        BUG_ON(!pte_none(*(kmap_pte+idx)));
 #endif
        set_pte(kmap_pte+idx, mk_pte(page, kmap_prot));
-       flush_tlb_page(0, vaddr);
+       flush_tlb_page(NULL, vaddr);
 
        return (void*) vaddr;
 }
@@ -115,7 +115,7 @@ static inline void kunmap_atomic(void *kvaddr, enum km_type type)
         * this pte without first remap it
         */
        pte_clear(kmap_pte+idx);
-       flush_tlb_page(0, vaddr);
+       flush_tlb_page(NULL, vaddr);
 #endif
        dec_preempt_count();
        preempt_check_resched();