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>
46 lines
929 B
C
46 lines
929 B
C
/*
|
|
* linux/arch/m68knommu/mm/kmap.c
|
|
*
|
|
* Copyright (C) 2000 Lineo, <davidm@snapgear.com>
|
|
* Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com>
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/types.h>
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/segment.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/io.h>
|
|
#include <asm/system.h>
|
|
|
|
#undef DEBUG
|
|
|
|
/*
|
|
* Map some physical address range into the kernel address space.
|
|
*/
|
|
void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
|
|
{
|
|
return (void *)physaddr;
|
|
}
|
|
|
|
/*
|
|
* Unmap a ioremap()ed region again.
|
|
*/
|
|
void iounmap(void *addr)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* Set new cache mode for some kernel address space.
|
|
* The caller must push data for that range itself, if such data may already
|
|
* be in the cache.
|
|
*/
|
|
void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
|
|
{
|
|
}
|