[PATCH] uml: S390 preparation, abstract host page fault data

[net-next-2.6.git] / arch / um / kernel / ptrace.c

diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index ffc599bd85c322ffee8313e2a2601e076a425e6b..ec19fed7c64b6f398f372eca58d6859ba8db24bf 100644 (file)
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -252,13 +252,13 @@ long sys_ptrace(long request, long pid, long addr, long data)
                break;
 #endif
        case PTRACE_FAULTINFO: {
-               struct ptrace_faultinfo fault;
-
-               fault = ((struct ptrace_faultinfo) 
-                       { .is_write     = child->thread.err,
-                         .addr         = child->thread.cr2 });
-               ret = copy_to_user((unsigned long __user *) data, &fault,
-                                  sizeof(fault));
+                /* Take the info from thread->arch->faultinfo,
+                 * but transfer max. sizeof(struct ptrace_faultinfo).
+                 * On i386, ptrace_faultinfo is smaller!
+                 */
+                ret = copy_to_user((unsigned long __user *) data,
+                                   &child->thread.arch.faultinfo,
+                                   sizeof(struct ptrace_faultinfo));
                if(ret)
                        break;
                break;
@@ -269,6 +269,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                                   sizeof(child->pending.signal));
                break;
 
+#ifdef PTRACE_LDT
        case PTRACE_LDT: {
                struct ptrace_ldt ldt;
 
@@ -284,6 +285,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                ret = -EIO;
                break;
        }
+#endif
 #ifdef CONFIG_PROC_MM
        case PTRACE_SWITCH_MM: {
                struct mm_struct *old = child->mm;