Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (30 commits)
  Blackfin: SMP: fix continuation lines
  Blackfin: acvilon: fix timeout usage for I2C
  Blackfin: fix typo in BF537 IRQ comment
  Blackfin: unify duplicate MEM_MT48LC32M8A2_75 kconfig options
  Blackfin: set ARCH_KMALLOC_MINALIGN
  Blackfin: use atomic kmalloc in L1 alloc so it too can be atomic
  Blackfin: another year of changes (update copyright in boot log)
  Blackfin: optimize strncpy a bit
  Blackfin: isram: clean up ITEST_COMMAND macro and improve the selftests
  Blackfin: move string functions to normal lib/ assembly
  Blackfin: SIC: cut down on IAR MMR reads a bit
  Blackfin: bf537-minotaur: fix build errors due to header changes
  Blackfin: kgdb: pass up the CC register instead of a 0 stub
  Blackfin: handle HW errors in the new "FAULT" printing code
  Blackfin: show the whole accumulator in the pseudo DBG insn
  Blackfin: support all possible registers in the pseudo instructions
  Blackfin: add support for the DBG (debug output) pseudo insn
  Blackfin: change the BUG opcode to an unused 16-bit opcode
  Blackfin: allow NMI watchdog to be used w/RETN as a scratch reg
  Blackfin: add support for the DBGA (debug assert) pseudo insn
  ...

1 files changed, 17 insertions, 43 deletions

diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 355b87aa6b93..bb4e8fff4b55 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -15,23 +15,11 @@
 #include "blackfin_sram.h"
 
 /*
- * 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.
+ * ZERO_PAGE is a special page that is used for zero-initialized data and COW.
+ * Let the bss do its zero-init magic so we don't have to do it ourselves.
  */
-static unsigned long empty_bad_page_table;
-
-static unsigned long empty_bad_page;
-
-static unsigned long empty_zero_page;
+char empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
+EXPORT_SYMBOL(empty_zero_page);
 
 #ifndef CONFIG_EXCEPTION_L1_SCRATCH
 #if defined CONFIG_SYSCALL_TAB_L1
@@ -52,40 +40,26 @@ EXPORT_SYMBOL(cpu_pda);
 void __init paging_init(void)
 {
         /*
-         * make sure start_mem is page aligned,  otherwise bootmem and
-         * page_alloc get different views og the world
+         * make sure start_mem is page aligned, otherwise bootmem and
+         * page_alloc get different views of the world
          */
         unsigned long end_mem = memory_end & PAGE_MASK;
 
-        pr_debug("start_mem is %#lx   virtual_end is %#lx\n", PAGE_ALIGN(memory_start), end_mem);
-
-        /*
-         * initialize the bad page table and bad page to point
-         * to a couple of allocated pages
-         */
-        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);
+        unsigned long zones_size[MAX_NR_ZONES] = {
+                [0] = 0,
+                [ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT,
+                [ZONE_NORMAL] = 0,
+#ifdef CONFIG_HIGHMEM
+                [ZONE_HIGHMEM] = 0,
+#endif
+        };
 
-        /*
-         * Set up SFC/DFC registers (user data space)
-         */
+        /* Set up SFC/DFC registers (user data space) */
         set_fs(KERNEL_DS);
 
-        pr_debug("free_area_init -> start_mem is %#lx   virtual_end is %#lx\n",
+        pr_debug("free_area_init -> start_mem is %#lx virtual_end is %#lx\n",
                 PAGE_ALIGN(memory_start), end_mem);
-
-        {
-                unsigned long zones_size[MAX_NR_ZONES] = { 0, };
-
-                zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
-                zones_size[ZONE_NORMAL] = 0;
-#ifdef CONFIG_HIGHMEM
-                zones_size[ZONE_HIGHMEM] = 0;
-#endif
-                free_area_init(zones_size);
-        }
+        free_area_init(zones_size);
 }
 
 asmlinkage void __init init_pda(void)