66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
150 lines
3.5 KiB
C
150 lines
3.5 KiB
C
/*
|
|
* linux/arch/m68k/mm/init.c
|
|
*
|
|
* Copyright (C) 1995 Hamish Macdonald
|
|
*
|
|
* Contains common initialization routines, specific init code moved
|
|
* to motorola.c and sun3mmu.c
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/signal.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/gfp.h>
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/uaccess.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/system.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/io.h>
|
|
#ifdef CONFIG_ATARI
|
|
#include <asm/atari_stram.h>
|
|
#endif
|
|
#include <asm/sections.h>
|
|
#include <asm/tlb.h>
|
|
|
|
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
|
|
pg_data_t pg_data_map[MAX_NUMNODES];
|
|
EXPORT_SYMBOL(pg_data_map);
|
|
|
|
int m68k_virt_to_node_shift;
|
|
|
|
#ifndef CONFIG_SINGLE_MEMORY_CHUNK
|
|
pg_data_t *pg_data_table[65];
|
|
EXPORT_SYMBOL(pg_data_table);
|
|
#endif
|
|
|
|
void __init m68k_setup_node(int node)
|
|
{
|
|
#ifndef CONFIG_SINGLE_MEMORY_CHUNK
|
|
struct mem_info *info = m68k_memory + node;
|
|
int i, end;
|
|
|
|
i = (unsigned long)phys_to_virt(info->addr) >> __virt_to_node_shift();
|
|
end = (unsigned long)phys_to_virt(info->addr + info->size - 1) >> __virt_to_node_shift();
|
|
for (; i <= end; i++) {
|
|
if (pg_data_table[i])
|
|
printk("overlap at %u for chunk %u\n", i, node);
|
|
pg_data_table[i] = pg_data_map + node;
|
|
}
|
|
#endif
|
|
pg_data_map[node].bdata = bootmem_node_data + node;
|
|
node_set_online(node);
|
|
}
|
|
|
|
|
|
/*
|
|
* ZERO_PAGE is a special page that is used for zero-initialized
|
|
* data and COW.
|
|
*/
|
|
|
|
void *empty_zero_page;
|
|
EXPORT_SYMBOL(empty_zero_page);
|
|
|
|
extern void init_pointer_table(unsigned long ptable);
|
|
|
|
/* References to section boundaries */
|
|
|
|
extern pmd_t *zero_pgtable;
|
|
|
|
void __init mem_init(void)
|
|
{
|
|
pg_data_t *pgdat;
|
|
int codepages = 0;
|
|
int datapages = 0;
|
|
int initpages = 0;
|
|
int i;
|
|
|
|
#ifdef CONFIG_ATARI
|
|
if (MACH_IS_ATARI)
|
|
atari_stram_mem_init_hook();
|
|
#endif
|
|
|
|
/* this will put all memory onto the freelists */
|
|
totalram_pages = num_physpages = 0;
|
|
for_each_online_pgdat(pgdat) {
|
|
num_physpages += pgdat->node_present_pages;
|
|
|
|
totalram_pages += free_all_bootmem_node(pgdat);
|
|
for (i = 0; i < pgdat->node_spanned_pages; i++) {
|
|
struct page *page = pgdat->node_mem_map + i;
|
|
char *addr = page_to_virt(page);
|
|
|
|
if (!PageReserved(page))
|
|
continue;
|
|
if (addr >= _text &&
|
|
addr < _etext)
|
|
codepages++;
|
|
else if (addr >= __init_begin &&
|
|
addr < __init_end)
|
|
initpages++;
|
|
else
|
|
datapages++;
|
|
}
|
|
}
|
|
|
|
#ifndef CONFIG_SUN3
|
|
/* insert pointer tables allocated so far into the tablelist */
|
|
init_pointer_table((unsigned long)kernel_pg_dir);
|
|
for (i = 0; i < PTRS_PER_PGD; i++) {
|
|
if (pgd_present(kernel_pg_dir[i]))
|
|
init_pointer_table(__pgd_page(kernel_pg_dir[i]));
|
|
}
|
|
|
|
/* insert also pointer table that we used to unmap the zero page */
|
|
if (zero_pgtable)
|
|
init_pointer_table((unsigned long)zero_pgtable);
|
|
#endif
|
|
|
|
printk("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init)\n",
|
|
nr_free_pages() << (PAGE_SHIFT-10),
|
|
totalram_pages << (PAGE_SHIFT-10),
|
|
codepages << (PAGE_SHIFT-10),
|
|
datapages << (PAGE_SHIFT-10),
|
|
initpages << (PAGE_SHIFT-10));
|
|
}
|
|
|
|
#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 ("Freeing initrd memory: %dk freed\n", pages);
|
|
}
|
|
#endif
|