[PATCH] Nuke check_highmem_ptes()

It was broken on at least ppc32 & sparc32, and the debugging it
offered wasn't worth it any more anyway.

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 3bc7bcb3c2526bce49b01c5cf5c149796314d277..4cd2f596e7052ab450f30b1a11aa97068af9ecb2 100644 (file)
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -32,13 +32,6 @@ static inline void *kmap(struct page *page)
 
 #endif /* CONFIG_HIGHMEM */
 
-#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_HIGHMEM)
-extern void check_highmem_ptes(void);
-#else
-static inline void check_highmem_ptes(void)
-{}
-#endif
-
 /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */
 static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {

diff --git a/kernel/sched.c b/kernel/sched.c
index 28d7fb9fee73627239cd3341739ebb00a353ea52..79c8794c1769f12f02d3a2c69498e1303c017cd4 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1258,7 +1258,6 @@ asmlinkage void schedule(void)
                }
        }
 
-       check_highmem_ptes();
 need_resched:
        preempt_disable();
        prev = current;

diff --git a/mm/highmem.c b/mm/highmem.c
index 8fb8c01be3b6ffe2d751cb53c2a4d1e4dffe863d..4dfd591ea60a70c2f3448cc563c527485b4e58d1 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -472,23 +472,6 @@ void blk_queue_bounce(request_queue_t *q, struct bio **bio_orig)
        __blk_queue_bounce(q, bio_orig, pool);
 }
 
-#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_HIGHMEM)
-void check_highmem_ptes(void)
-{
-       int idx, type;
-
-       preempt_disable();
-       for (type = 0; type < KM_TYPE_NR; type++) {
-               idx = type + KM_TYPE_NR*smp_processor_id();
-               if (!pte_none(*(kmap_pte-idx))) {
-                       printk("scheduling with KM_TYPE %d held!\n", type);
-                       BUG();
-               }
-       }
-       preempt_enable();
-}
-#endif
-
 #if defined(HASHED_PAGE_VIRTUAL)
 
 #define PA_HASH_ORDER  7