diff --git a/[refs] b/[refs] index 46fec0ef9434..bbf586a1f7e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7595fe7e8a93a73ce6199dace75a0caca7024c1 +refs/heads/master: 0176bd3dab4fe522bfb6ceab9e3c441fe0305738 diff --git a/trunk/arch/sh/include/asm/pgalloc.h b/trunk/arch/sh/include/asm/pgalloc.h index e106474996b2..f8982f4e0405 100644 --- a/trunk/arch/sh/include/asm/pgalloc.h +++ b/trunk/arch/sh/include/asm/pgalloc.h @@ -4,7 +4,7 @@ #include #include -#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/trunk/mm/Kconfig b/trunk/mm/Kconfig index 17b8947aa7da..d34c2b971032 100644 --- a/trunk/mm/Kconfig +++ b/trunk/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