Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[karo-tx-linux.git] / arch / powerpc / kernel / ptrace32.c

diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 544368277d7e53dfb145215f198892f263030c3a..91eb952e0293c63d40580f0b82cde0068a60b140 100644 (file)
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -40,8 +40,8 @@
  * in exit.c or in signal.c.
  */
 
-int compat_sys_ptrace(int request, int pid, unsigned long addr,
-                     unsigned long data)
+long compat_sys_ptrace(int request, int pid, unsigned long addr,
+                      unsigned long data)
 {
        struct task_struct *child;
        int ret = -EPERM;