 66d857b08b
			
		
	
	
	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>
		
			
				
	
	
		
			94 lines
		
	
	
	
		
			2.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
	
		
			2.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * linux/arch/m68knommu/kernel/sys_m68k.c
 | |
|  *
 | |
|  * This file contains various random system calls that
 | |
|  * have a non-standard calling sequence on the Linux/m68k
 | |
|  * platform.
 | |
|  */
 | |
| 
 | |
| #include <linux/errno.h>
 | |
| #include <linux/sched.h>
 | |
| #include <linux/mm.h>
 | |
| #include <linux/smp.h>
 | |
| #include <linux/sem.h>
 | |
| #include <linux/msg.h>
 | |
| #include <linux/shm.h>
 | |
| #include <linux/stat.h>
 | |
| #include <linux/syscalls.h>
 | |
| #include <linux/mman.h>
 | |
| #include <linux/file.h>
 | |
| #include <linux/ipc.h>
 | |
| #include <linux/fs.h>
 | |
| 
 | |
| #include <asm/setup.h>
 | |
| #include <asm/uaccess.h>
 | |
| #include <asm/cachectl.h>
 | |
| #include <asm/traps.h>
 | |
| #include <asm/cacheflush.h>
 | |
| #include <asm/unistd.h>
 | |
| 
 | |
| /* sys_cacheflush -- flush (part of) the processor cache.  */
 | |
| asmlinkage int
 | |
| sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
 | |
| {
 | |
| 	flush_cache_all();
 | |
| 	return(0);
 | |
| }
 | |
| 
 | |
| asmlinkage int sys_getpagesize(void)
 | |
| {
 | |
| 	return PAGE_SIZE;
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Do a system call from kernel instead of calling sys_execve so we
 | |
|  * end up with proper pt_regs.
 | |
|  */
 | |
| int kernel_execve(const char *filename,
 | |
| 		  const char *const argv[],
 | |
| 		  const char *const envp[])
 | |
| {
 | |
| 	register long __res asm ("%d0") = __NR_execve;
 | |
| 	register long __a asm ("%d1") = (long)(filename);
 | |
| 	register long __b asm ("%d2") = (long)(argv);
 | |
| 	register long __c asm ("%d3") = (long)(envp);
 | |
| 	asm volatile ("trap  #0" : "+d" (__res)
 | |
| 			: "d" (__a), "d" (__b), "d" (__c));
 | |
| 	return __res;
 | |
| }
 | |
| 
 | |
| asmlinkage unsigned long sys_get_thread_area(void)
 | |
| {
 | |
| 	return current_thread_info()->tp_value;
 | |
| }
 | |
| 
 | |
| asmlinkage int sys_set_thread_area(unsigned long tp)
 | |
| {
 | |
| 	current_thread_info()->tp_value = tp;
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| /* This syscall gets its arguments in A0 (mem), D2 (oldval) and
 | |
|    D1 (newval).  */
 | |
| asmlinkage int
 | |
| sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
 | |
| 		      unsigned long __user * mem)
 | |
| {
 | |
| 	struct mm_struct *mm = current->mm;
 | |
| 	unsigned long mem_value;
 | |
| 
 | |
| 	down_read(&mm->mmap_sem);
 | |
| 
 | |
| 	mem_value = *mem;
 | |
| 	if (mem_value == oldval)
 | |
| 		*mem = newval;
 | |
| 
 | |
| 	up_read(&mm->mmap_sem);
 | |
| 	return mem_value;
 | |
| }
 | |
| 
 | |
| asmlinkage int sys_atomic_barrier(void)
 | |
| {
 | |
| 	/* no code needed for uniprocs */
 | |
| 	return 0;
 | |
| }
 |