Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 150 insertions, 0 deletions

diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c
new file mode 100644
index 000000000000..7cbd7bd1f8bc
--- /dev/null
+++ b/arch/m68k/mm/init_no.c
@@ -0,0 +1,150 @@
+/*
+ *  linux/arch/m68knommu/mm/init.c
+ *
+ *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
+ *                      Kenneth Albanowski <kjahds@kjahds.com>,
+ *  Copyright (C) 2000  Lineo, Inc.  (www.lineo.com) 
+ *
+ *  Based on:
+ *
+ *  linux/arch/m68k/mm/init.c
+ *
+ *  Copyright (C) 1995  Hamish Macdonald
+ *
+ *  JAN/1999 -- hacked to support ColdFire (gerg@snapgear.com)
+ *  DEC/2000 -- linux 2.4 support <davidm@snapgear.com>
+ */
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/ptrace.h>
+#include <linux/mman.h>
+#include <linux/mm.h>
+#include <linux/swap.h>
+#include <linux/init.h>
+#include <linux/highmem.h>
+#include <linux/pagemap.h>
+#include <linux/bootmem.h>
+#include <linux/gfp.h>
+
+#include <asm/setup.h>
+#include <asm/segment.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/system.h>
+#include <asm/machdep.h>
+
+/*
+ * ZERO_PAGE is a special page that is used for zero-initialized
+ * data and COW.
+ */
+unsigned long empty_zero_page;
+
+extern unsigned long memory_start;
+extern unsigned long memory_end;
+
+/*
+ * paging_init() continues the virtual memory environment setup which
+ * was begun by the code in arch/head.S.
+ * The parameters are pointers to where to stick the starting and ending
+ * addresses of available kernel virtual memory.
+ */
+void __init paging_init(void)
+{
+        /*
+         * 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;
+        unsigned long zones_size[MAX_NR_ZONES] = {0, };
+
+        empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
+        memset((void *)empty_zero_page, 0, PAGE_SIZE);
+
+        /*
+         * Set up SFC/DFC registers (user data space).
+         */
+        set_fs (USER_DS);
+
+        zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
+        free_area_init(zones_size);
+}
+
+void __init mem_init(void)
+{
+        int codek = 0, datak = 0, initk = 0;
+        unsigned long tmp;
+        extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end;
+        extern unsigned int _ramend, _rambase;
+        unsigned long len = _ramend - _rambase;
+        unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
+        unsigned long end_mem   = memory_end; /* DAVIDM - this must not include kernel stack at top */
+
+        pr_debug("Mem_init: start=%lx, end=%lx\n", start_mem, end_mem);
+
+        end_mem &= PAGE_MASK;
+        high_memory = (void *) end_mem;
+
+        start_mem = PAGE_ALIGN(start_mem);
+        max_mapnr = num_physpages = (((unsigned long) high_memory) - PAGE_OFFSET) >> PAGE_SHIFT;
+
+        /* this will put all memory onto the freelists */
+        totalram_pages = free_all_bootmem();
+
+        codek = (&_etext - &_stext) >> 10;
+        datak = (&_ebss - &_sdata) >> 10;
+        initk = (&__init_begin - &__init_end) >> 10;
+
+        tmp = nr_free_pages() << PAGE_SHIFT;
+        printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",
+               tmp >> 10,
+               len >> 10,
+               codek,
+               datak
+               );
+}
+
+
+#ifdef CONFIG_BLK_DEV_INITRD
+void free_initrd_mem(unsigned long start, unsigned long end)
+{
+        int pages = 0;
+        for (; start < end; start += PAGE_SIZE) {
+                ClearPageReserved(virt_to_page(start));
+                init_page_count(virt_to_page(start));
+                free_page(start);
+                totalram_pages++;
+                pages++;
+        }
+        printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
+}
+#endif
+
+void free_initmem(void)
+{
+#ifdef CONFIG_RAMKERNEL
+        unsigned long addr;
+        extern char __init_begin, __init_end;
+        /*
+         * The following code should be cool even if these sections
+         * are not page aligned.
+         */
+        addr = PAGE_ALIGN((unsigned long)(&__init_begin));
+        /* next to check that the page we free is not a partial page */
+        for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) {
+                ClearPageReserved(virt_to_page(addr));
+                init_page_count(virt_to_page(addr));
+                free_page(addr);
+                totalram_pages++;
+        }
+        printk(KERN_NOTICE "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
+                        (addr - PAGE_ALIGN((long) &__init_begin)) >> 10,
+                        (int)(PAGE_ALIGN((unsigned long)(&__init_begin))),
+                        (int)(addr - PAGE_SIZE));
+#endif
+}
+