---

yaml --- r: 356722 b: refs/heads/master c: d914b8d h: refs/heads/master v: v3
git-mirror · Feb 3, 2013 · 1cf1fd7 · 1cf1fd7
1 parent 27ed52f
commit 1cf1fd7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 441ff959072b3f4b0712b149a3398f76f8ddfceb
+refs/heads/master: d914b8dcbbde8e47b6762d66600ea66ccd18ef45
diff --git a/trunk/arch/parisc/kernel/sys_parisc32.c b/trunk/arch/parisc/kernel/sys_parisc32.c
@@ -61,18 +61,6 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
     return -ENOSYS;
 }
 
-asmlinkage long sys32_sched_rr_get_interval(pid_t pid,
-	struct compat_timespec __user *interval)
-{
-	struct timespec t;
-	int ret;
-
-	KERNEL_SYSCALL(ret, sys_sched_rr_get_interval, pid, (struct timespec __user *)&t);
-	if (put_compat_timespec(&t, interval))
-		return -EFAULT;
-	return ret;
-}
-
 struct msgbuf32 {
     int mtype;
     char mtext[1];

diff --git a/trunk/arch/parisc/kernel/syscall_table.S b/trunk/arch/parisc/kernel/syscall_table.S
@@ -250,7 +250,7 @@
 	/* These 2 would've worked if someone had defined struct timespec
 	 * carefully, like timeval for example (which is about the same).
 	 * Unfortunately it contains a long :-( */
-	ENTRY_DIFF(sched_rr_get_interval)
+	ENTRY_COMP(sched_rr_get_interval)
 	ENTRY_COMP(nanosleep)
 	ENTRY_SAME(mremap)
 	ENTRY_SAME(setresuid)