mirror of https://gitee.com/openkylin/linux.git
[PATCH] uml: merge mem_user.c and mem.c
The serial UML OS-abstraction layer patch (um/kernel dir). This joins mem_user.c and mem.c files. Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
0f80bc85c5
commit
114069f738
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
#
|
||||
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
||||
# Licensed under the GPL
|
||||
#
|
||||
|
@ -7,11 +7,11 @@ extra-y := vmlinux.lds
|
|||
clean-files :=
|
||||
|
||||
obj-y = config.o exec_kern.o exitcode.o \
|
||||
helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \
|
||||
physmem.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
|
||||
sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o \
|
||||
time.o time_kern.o tlb.o trap_kern.o trap_user.o \
|
||||
uaccess_user.o um_arch.o umid.o user_util.o
|
||||
helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o physmem.o \
|
||||
process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
|
||||
signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \
|
||||
time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \
|
||||
umid.o user_util.o
|
||||
|
||||
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
|
||||
obj-$(CONFIG_GPROF) += gprof_syms.o
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
@ -19,6 +19,10 @@
|
|||
#include "mem_user.h"
|
||||
#include "uml_uaccess.h"
|
||||
#include "os.h"
|
||||
#include "linux/types.h"
|
||||
#include "linux/string.h"
|
||||
#include "init.h"
|
||||
#include "kern_constants.h"
|
||||
|
||||
extern char __binary_start;
|
||||
|
||||
|
@ -368,6 +372,16 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
|
|||
return pte;
|
||||
}
|
||||
|
||||
struct iomem_region *iomem_regions = NULL;
|
||||
int iomem_size = 0;
|
||||
|
||||
extern int parse_iomem(char *str, int *add) __init;
|
||||
|
||||
__uml_setup("iomem=", parse_iomem,
|
||||
"iomem=<name>,<file>\n"
|
||||
" Configure <file> as an IO memory region named <name>.\n\n"
|
||||
);
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* Emacs will notice this stuff at the end of the file and automatically
|
||||
|
|
|
@ -1,70 +0,0 @@
|
|||
/*
|
||||
* arch/um/kernel/mem_user.c
|
||||
*
|
||||
* BRIEF MODULE DESCRIPTION
|
||||
* user side memory routines for supporting IO memory inside user mode linux
|
||||
*
|
||||
* Copyright (C) 2001 RidgeRun, Inc.
|
||||
* Author: RidgeRun, Inc.
|
||||
* Greg Lonnon glonnon@ridgerun.com or info@ridgerun.com
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <stdarg.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include "kern_util.h"
|
||||
#include "user.h"
|
||||
#include "user_util.h"
|
||||
#include "mem_user.h"
|
||||
#include "init.h"
|
||||
#include "os.h"
|
||||
#include "tempfile.h"
|
||||
#include "kern_constants.h"
|
||||
|
||||
struct iomem_region *iomem_regions = NULL;
|
||||
int iomem_size = 0;
|
||||
|
||||
extern int parse_iomem(char *str, int *add) __init;
|
||||
|
||||
__uml_setup("iomem=", parse_iomem,
|
||||
"iomem=<name>,<file>\n"
|
||||
" Configure <file> as an IO memory region named <name>.\n\n"
|
||||
);
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* Emacs will notice this stuff at the end of the file and automatically
|
||||
* adjust the settings for this buffer only. This must remain at the end
|
||||
* of the file.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
*/
|
Loading…
Reference in New Issue