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

Commit 6113f39d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  asm-generic: support clock_adjtime() in <asm-generic/unistd.h>
  arch/tile: fix futex sanitization definition/prototype mismatch
parents db552b33 339dc50e

arch/tile/lib/atomic_32.c

+6 −6
Original line number Diff line number Diff line
@@ -202,32 +202,32 @@ static inline int *__futex_setup(int __user *v) 
	return __atomic_hashed_lock((int __force *)v);

}



struct __get_user futex_set(int __user *v, int i)

struct __get_user futex_set(u32 __user *v, int i)

{

	return __atomic_xchg((int __force *)v, __futex_setup(v), i);

}



struct __get_user futex_add(int __user *v, int n)

struct __get_user futex_add(u32 __user *v, int n)

{

	return __atomic_xchg_add((int __force *)v, __futex_setup(v), n);

}



struct __get_user futex_or(int __user *v, int n)

struct __get_user futex_or(u32 __user *v, int n)

{

	return __atomic_or((int __force *)v, __futex_setup(v), n);

}



struct __get_user futex_andn(int __user *v, int n)

struct __get_user futex_andn(u32 __user *v, int n)

{

	return __atomic_andn((int __force *)v, __futex_setup(v), n);

}



struct __get_user futex_xor(int __user *v, int n)

struct __get_user futex_xor(u32 __user *v, int n)

{

	return __atomic_xor((int __force *)v, __futex_setup(v), n);

}



struct __get_user futex_cmpxchg(int __user *v, int o, int n)

struct __get_user futex_cmpxchg(u32 __user *v, int o, int n)

{

	return __atomic_cmpxchg((int __force *)v, __futex_setup(v), o, n);

}

include/asm-generic/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -650,9 +650,11 @@ __SYSCALL(__NR_fanotify_mark, sys_fanotify_mark) 
__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)

#define __NR_open_by_handle_at		265

__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)

#define __NR_clock_adjtime 266

__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)



#undef __NR_syscalls

#define __NR_syscalls 266

#define __NR_syscalls 267



/*

 * All syscalls below here should go away really,