From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Ingo Molnar Reply-To: Ingo Molnar In-Reply-To: Message-ID: References: <20031217174901.GA6709@ccure.user-mode-linux.org> <200312180146.hBI1k1kS008213@ccure.user-mode-linux.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: [uml-devel] Re: [patch] host-skas support for 2.6.0, other UML fixes Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Thu, 18 Dec 2003 12:56:36 +0100 (CET) To: Jeff Dike , user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net the attached patch is necessary in addition to the previous ones, to get a unified 2.6.0 UML tree: both UML and the host-kernel can be compiled cleanly from the same tree. To 'replicate' an existing tree, i use the following method: cd linux-host make mrproper cd .. cp -rl linux-host linux-UML this creates a hard-linked clone of the kernel tree. Now the linux-host kernel and the linux-UML kernels can be configured & compiled independently. Any change to an existing source file in one tree will affect the other tree too. Ingo --- linux/arch/um/kernel/ptrace.c.orig +++ linux/arch/um/kernel/ptrace.c @@ -24,11 +24,6 @@ void ptrace_disable(struct task_struct * { } -extern long do_mmap2(struct task_struct *task, unsigned long addr, - unsigned long len, unsigned long prot, - unsigned long flags, unsigned long fd, - unsigned long pgoff); - int sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; --- linux/arch/um/include/skas_ptrace.h.orig +++ linux/arch/um/include/skas_ptrace.h @@ -6,6 +6,10 @@ #ifndef __SKAS_PTRACE_H #define __SKAS_PTRACE_H + +#ifndef _LINUX_PTRACE_STRUCT_DEF +#define _LINUX_PTRACE_STRUCT_DEF + struct ptrace_faultinfo { int is_write; unsigned long addr; @@ -17,6 +21,8 @@ struct ptrace_ldt { unsigned long bytecount; }; +#endif + #define PTRACE_FAULTINFO 52 #define PTRACE_SIGPENDING 53 #define PTRACE_LDT 54 --- linux/include/linux/ptrace.h.orig +++ linux/include/linux/ptrace.h @@ -26,6 +26,10 @@ #define PTRACE_LDT 54 #define PTRACE_SWITCH_MM 55 + +#ifndef _LINUX_PTRACE_STRUCT_DEF +#define _LINUX_PTRACE_STRUCT_DEF + struct ptrace_faultinfo { int is_write; unsigned long addr; @@ -37,6 +41,8 @@ struct ptrace_ldt { unsigned long bytecount; }; +#endif + /* 0x4200-0x4300 are reserved for architecture-independent additions. */ #define PTRACE_SETOPTIONS 0x4200 #define PTRACE_GETEVENTMSG 0x4201 ------------------------------------------------------- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel