Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ad50c38 authored by Catalin Marinas's avatar Catalin Marinas Committed by Linus Torvalds
Browse files

compat: generic compat_sys_sched_rr_get_interval() implementation 



This function is used by sparc, powerpc tile and arm64 for compat support.
 The patch adds a generic implementation with a wrapper for PowerPC to do
the u32->int sign extension.

The reason for a single patch covering powerpc, tile, sparc and arm64 is
to keep it bisectable, otherwise kernel building may fail with mismatched
function declarations.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>  [for tile]
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 918854a6

arch/arm64/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

arch/arm64/kernel/sys_compat.c

+0 −15
Original line number Diff line number Diff line
@@ -28,21 +28,6 @@ 
#include <asm/cacheflush.h>

#include <asm/unistd32.h>



asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid,

						struct compat_timespec __user *interval)

{

	struct timespec t;

	int ret;

	mm_segment_t old_fs = get_fs();



	set_fs(KERNEL_DS);

	ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);

	set_fs(old_fs);

	if (put_compat_timespec(&t, interval))

		return -EFAULT;

	return ret;

}



static inline void

do_compat_cache_op(unsigned long start, unsigned long end, int flags)

{

arch/powerpc/include/asm/systbl.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ COMPAT_SYS_SPU(sched_getscheduler) 
SYSCALL_SPU(sched_yield)

COMPAT_SYS_SPU(sched_get_priority_max)

COMPAT_SYS_SPU(sched_get_priority_min)

COMPAT_SYS_SPU(sched_rr_get_interval)

SYSX_SPU(sys_sched_rr_get_interval,compat_sys_sched_rr_get_interval_wrapper,sys_sched_rr_get_interval)

COMPAT_SYS_SPU(nanosleep)

SYSCALL_SPU(mremap)

SYSCALL_SPU(setresuid)

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_SYS_NEWFSTATAT

#define __ARCH_WANT_COMPAT_SYS_SENDFILE

#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL

#endif

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_FORK

arch/powerpc/kernel/sys_ppc32.c

+4 −13
Original line number Diff line number Diff line
@@ -175,19 +175,10 @@ asmlinkage long compat_sys_prctl(u32 option, u32 arg2, u32 arg3, u32 arg4, u32 a 
 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)

 * and the register representation of a signed int (msr in 64-bit mode) is performed.

 */

asmlinkage long compat_sys_sched_rr_get_interval(u32 pid, struct compat_timespec __user *interval)

{

	struct timespec t;

	int ret;

	mm_segment_t old_fs = get_fs ();



	/* The __user pointer cast is valid because of the set_fs() */

	set_fs (KERNEL_DS);

	ret = sys_sched_rr_get_interval((int)pid, (struct timespec __user *) &t);

	set_fs (old_fs);

	if (put_compat_timespec(&t, interval))

		return -EFAULT;

	return ret;

asmlinkage long compat_sys_sched_rr_get_interval_wrapper(u32 pid,

							 struct compat_timespec __user *interval)

{

	return compat_sys_sched_rr_get_interval((int)pid, interval);

}



/* Note: it is necessary to treat mode as an unsigned int,