sh: Drop down to a single quicklist.

We previously had 2 quicklists, one for the PGD case and one for PTEs.
Now that the PGD/PMD cases are handled through slab caches due to the
multi-level configurability, only the PTE quicklist remains. As such,
reduce NR_QUICK to its appropriate size and bump down the PTE quicklist
index.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index e106474996b237c57cb5072b3221d8b9d11e95b6..f8982f4e0405862bf366a4dcbf51a31311743f91 100644 (file)
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
@@ -4,7 +4,7 @@
 #include <linux/quicklist.h>
 #include <asm/page.h>
 
-#define QUICK_PT 1     /* Other page table pages that are zero on free */
+#define QUICK_PT 0     /* Other page table pages that are zero on free */
 
 extern pgd_t *pgd_alloc(struct mm_struct *);
 extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);

diff --git a/mm/Kconfig b/mm/Kconfig
index 17b8947aa7daff59f0a92713f1fe97c8cf9fa721..d34c2b971032af55b99c18ef547735275e8de1d4 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -195,7 +195,7 @@ config BOUNCE
 config NR_QUICK
        int
        depends on QUICKLIST
-       default "2" if SUPERH || AVR32
+       default "2" if AVR32
        default "1"
 
 config VIRT_TO_BUS