Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / kernel / ptrace32.c

diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 8a6daf4129f67ffb143e762a3972a1419b30d0bd..69c4be917d07e1331621994b572a6db30e2cb3cc 100644 (file)
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -280,7 +280,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                /* We only support one DABR and no IABRS at the moment */
                if (addr > 0)
                        break;
+#ifdef CONFIG_PPC_ADV_DEBUG_REGS
+               ret = put_user(child->thread.dac1, (u32 __user *)data);
+#else
                ret = put_user(child->thread.dabr, (u32 __user *)data);
+#endif
                break;
        }
 
@@ -312,6 +316,9 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
        case PTRACE_SET_DEBUGREG:
        case PTRACE_SYSCALL:
        case PTRACE_CONT:
+       case PPC_PTRACE_GETHWDBGINFO:
+       case PPC_PTRACE_SETHWDEBUG:
+       case PPC_PTRACE_DELHWDEBUG:
                ret = arch_ptrace(child, request, addr, data);
                break;