From 73f19eba46b9930e57666696f9c3662c6020fcf5 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 1 Sep 2008 11:23:30 +1000
Subject: [PATCH] --- yaml --- r: 114522 b: refs/heads/master c:
 d6c93adbeb98c56e19f7df37633566b39fbcd4c9 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/include/asm/systbl.h | 2 +-
 trunk/arch/powerpc/kernel/sys_ppc32.c   | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7f604f34b6c2..7188d7e34b1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 549e8152de8039506f69c677a4546e5427aa6ae7
+refs/heads/master: d6c93adbeb98c56e19f7df37633566b39fbcd4c9
diff --git a/trunk/arch/powerpc/include/asm/systbl.h b/trunk/arch/powerpc/include/asm/systbl.h
index f6cc7a43b4fa..803def236654 100644
--- a/trunk/arch/powerpc/include/asm/systbl.h
+++ b/trunk/arch/powerpc/include/asm/systbl.h
@@ -32,7 +32,7 @@ COMPAT_SYS_SPU(stime)
 COMPAT_SYS(ptrace)
 SYSCALL_SPU(alarm)
 OLDSYS(fstat)
-COMPAT_SYS(pause)
+SYSCALL(pause)
 COMPAT_SYS(utime)
 SYSCALL(ni_syscall)
 SYSCALL(ni_syscall)
diff --git a/trunk/arch/powerpc/kernel/sys_ppc32.c b/trunk/arch/powerpc/kernel/sys_ppc32.c
index d98634c76060..ff7de7b0797e 100644
--- a/trunk/arch/powerpc/kernel/sys_ppc32.c
+++ b/trunk/arch/powerpc/kernel/sys_ppc32.c
@@ -107,14 +107,6 @@ asmlinkage long compat_sys_sysfs(u32 option, u32 arg1, u32 arg2)
 	return sys_sysfs((int)option, arg1, arg2);
 }
 
-asmlinkage long compat_sys_pause(void)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	
-	return -ERESTARTNOHAND;
-}
-
 static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)
 {
 	long usec;