[uml-devel] [UML patch] fixes for !CONFIG_PROC_MM, 2.6.0

[Ingo Molnar <mingo@elte.hu>]

the attached patch makes the combo 2.6.0 patch compile for the
!CONFIG_PROC_MM case. (necessary if forcing TT mode by disabling skas.)

This is also a small cleanup as it moves the architecture-independent
ptrace functions into the generic kernel/ptrace.c file.

i've also uploaded a new combo patch with the alignment fix plus these
changes included:

    redhat.com/~mingo/UML-patches/uml-combo-2.6.0-A2

	Ingo

--- linux/arch/i386/kernel/ptrace.c.orig	
+++ linux/arch/i386/kernel/ptrace.c	
@@ -521,12 +521,6 @@ asmlinkage int sys_ptrace(long request, 
 		break;
 	}
 
-	case PTRACE_SIGPENDING:
-		ret = copy_to_user((unsigned long *) data, 
-				   &child->pending.signal,
-				   sizeof(child->pending.signal));
-		break;
-
 	case PTRACE_LDT: {
 		struct ptrace_ldt ldt;
 
@@ -539,23 +533,6 @@ asmlinkage int sys_ptrace(long request, 
 		break;
 	}
 
-	case PTRACE_SWITCH_MM: {
-		struct mm_struct *old = child->mm;
-		struct mm_struct *new = proc_mm_get_mm(data);
-
-		if(IS_ERR(new)){
-			ret = PTR_ERR(new);
-			break;
-		}
-
-		atomic_inc(&new->mm_users);
-		child->mm = new;
-		child->active_mm = new;
-		mmput(old);
-		ret = 0;
-		break;
-	}
-
 	default:
 		ret = ptrace_request(child, request, addr, data);
 		break;
--- linux/kernel/ptrace.c.orig	
+++ linux/kernel/ptrace.c	
@@ -316,6 +316,32 @@ int ptrace_request(struct task_struct *c
 	case PTRACE_SETSIGINFO:
 		ret = ptrace_setsiginfo(child, (siginfo_t __user *) data);
 		break;
+	case PTRACE_SIGPENDING:
+		ret = copy_to_user((unsigned long *) data, 
+				   &child->pending.signal,
+				   sizeof(child->pending.signal));
+		break;
+
+#ifdef CONFIG_PROC_MM
+	case PTRACE_SWITCH_MM:
+	{
+		struct mm_struct *old = child->mm;
+		struct mm_struct *new = proc_mm_get_mm(data);
+
+		if (IS_ERR(new)) {
+			ret = PTR_ERR(new);
+			break;
+		}
+
+		atomic_inc(&new->mm_users);
+		child->mm = new;
+		child->active_mm = new;
+		mmput(old);
+		ret = 0;
+		break;
+	}
+#endif
+
 	default:
 		break;
 	}


-------------------------------------------------------
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