Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / frv / mm / init.c

diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 328f0a2923168cfdfdce579d8e2504cc82d886aa..cf464100e83883c232bff4ff9ae18d511eafde08 100644 (file)
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -42,21 +42,9 @@
 #undef DEBUG
 
 /*
- * BAD_PAGE is the page that is used for page faults when linux
- * is out-of-memory. Older versions of linux just did a
- * do_exit(), but using this instead means there is less risk
- * for a process dying in kernel mode, possibly leaving a inode
- * unused etc..
- *
- * BAD_PAGETABLE is the accompanying page-table: it is initialized
- * to point to BAD_PAGE entries.
- *
  * ZERO_PAGE is a special page that is used for zero-initialized
  * data and COW.
  */
-static unsigned long empty_bad_page_table;
-static unsigned long empty_bad_page;
-
 unsigned long empty_zero_page;
 EXPORT_SYMBOL(empty_zero_page);
 
@@ -72,8 +60,6 @@ void __init paging_init(void)
        unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
        /* allocate some pages for kernel housekeeping tasks */
-       empty_bad_page_table    = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
-       empty_bad_page          = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
        empty_zero_page         = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
 
        memset((void *) empty_zero_page, 0, PAGE_SIZE);