[PATCH] uml: obvious compile fixes for x86-64 Subarch and x86 regression fixes

This patch does some totally trivial compilation fixes.  It also restores the
debugregs manipulation, which was commented out simply because it doesn't
compile on x86_64 (we haven't yet implemented there debugregs handling).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 5 insertions, 1 deletions

diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 959b2d2490df..ffc599bd85c3 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -98,12 +98,14 @@ long sys_ptrace(long request, long pid, long addr, long data)
                 if(addr < MAX_REG_OFFSET){
                         tmp = getreg(child, addr);
                 }
+#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
                 else if((addr >= offsetof(struct user, u_debugreg[0])) &&
                         (addr <= offsetof(struct user, u_debugreg[7]))){
                         addr -= offsetof(struct user, u_debugreg[0]);
                         addr = addr >> 2;
                         tmp = child->thread.arch.debugregs[addr];
                 }
+#endif
                 ret = put_user(tmp, (unsigned long __user *) data);
                 break;
         }
@@ -127,7 +129,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                         ret = putreg(child, addr, data);
                         break;
                 }
-#if 0 /* XXX x86_64 */
+#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
                 else if((addr >= offsetof(struct user, u_debugreg[0])) &&
                         (addr <= offsetof(struct user, u_debugreg[7]))){
                           addr -= offsetof(struct user, u_debugreg[0]);
diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c
index ab4b0abf8af3..2a575ef52bba 100644
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
@@ -7,6 +7,8 @@
 #include "linux/linkage.h"
 #include "linux/slab.h"
 #include "linux/shm.h"
+#include "linux/utsname.h"
+#include "linux/personality.h"
 #include "asm/uaccess.h"
 #define __FRAME_OFFSETS
 #include "asm/ptrace.h"