4 files changed, 15 insertions, 3 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 311a300d48cc..75f25a8e3001 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1,6 +1,7 @@
 config M68K
         bool
         default y
+        select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
         select HAVE_IDE
         select HAVE_AOUT if MMU
         select HAVE_DEBUG_BUGVERBOSE
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h
index 313f3dd23cdc..f9924fbcfe42 100644
--- a/arch/m68k/include/asm/mcf_pgalloc.h
+++ b/arch/m68k/include/asm/mcf_pgalloc.h
@@ -56,6 +56,10 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
 
         if (!page)
                 return NULL;
+        if (!pgtable_page_ctor(page)) {
+                __free_page(page);
+                return NULL;
+        }
 
         pte = kmap(page);
         if (pte) {
diff --git a/arch/m68k/include/asm/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h
index 2f02f264e694..24bcba496c75 100644
--- a/arch/m68k/include/asm/motorola_pgalloc.h
+++ b/arch/m68k/include/asm/motorola_pgalloc.h
@@ -29,18 +29,22 @@ static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
 
 static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
+        struct page *page;
         pte_t *pte;
 
+        page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
         if(!page)
                 return NULL;
+        if (!pgtable_page_ctor(page)) {
+                __free_page(page);
+                return NULL;
+        }
 
         pte = kmap(page);
         __flush_page_to_ram(pte);
         flush_tlb_kernel_page(pte);
         nocache_page(pte);
         kunmap(page);
-        pgtable_page_ctor(page);
         return page;
 }
 
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h
index 48d80d5a666f..f868506e3350 100644
--- a/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/arch/m68k/include/asm/sun3_pgalloc.h
@@ -59,7 +59,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
                 return NULL;
 
         clear_highpage(page);
-        pgtable_page_ctor(page);
+        if (!pgtable_page_ctor(page)) {
+                __free_page(page);
+                return NULL;
+        }
         return page;
 
 }