2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Heiko Carstens commit ae1251ab785f6da87219df8352ffdac68bba23e4 upstream. Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman --- kernel/sys.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/kernel/sys.c +++ b/kernel/sys.c @@ -470,7 +470,7 @@ void ctrl_alt_del(void) * SMP: There are not races, the GIDs are checked only by filesystem * operations (as far as semantic preservation is concerned). */ -asmlinkage long sys_setregid(gid_t rgid, gid_t egid) +SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid) { int old_rgid = current->gid; int old_egid = current->egid; @@ -519,7 +519,7 @@ asmlinkage long sys_setregid(gid_t rgid, * * SMP: Same implicit races as above. */ -asmlinkage long sys_setgid(gid_t gid) +SYSCALL_DEFINE1(setgid, gid_t, gid) { int old_egid = current->egid; int retval; @@ -589,7 +589,7 @@ static int set_user(uid_t new_ruid, int * 100% compatible with BSD. A program which uses just setuid() will be * 100% compatible with POSIX with saved IDs. */ -asmlinkage long sys_setreuid(uid_t ruid, uid_t euid) +SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid) { int old_ruid, old_euid, old_suid, new_ruid, new_euid; int retval; @@ -651,7 +651,7 @@ asmlinkage long sys_setreuid(uid_t ruid, * will allow a root program to temporarily drop privileges and be able to * regain them by swapping the real and effective uid. */ -asmlinkage long sys_setuid(uid_t uid) +SYSCALL_DEFINE1(setuid, uid_t, uid) { int old_euid = current->euid; int old_ruid, old_suid, new_suid; @@ -690,7 +690,7 @@ asmlinkage long sys_setuid(uid_t uid) * This function implements a generic ability to update ruid, euid, * and suid. This allows you to implement the 4.4 compatible seteuid(). */ -asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid) +SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid) { int old_ruid = current->uid; int old_euid = current->euid; @@ -747,7 +747,7 @@ SYSCALL_DEFINE3(getresuid, uid_t __user /* * Same as above, but for rgid, egid, sgid. */ -asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid) +SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid) { int retval; @@ -802,7 +802,7 @@ SYSCALL_DEFINE3(getresgid, gid_t __user * whatever uid it wants to). It normally shadows "euid", except when * explicitly set by setfsuid() or for access.. */ -asmlinkage long sys_setfsuid(uid_t uid) +SYSCALL_DEFINE1(setfsuid, uid_t, uid) { int old_fsuid; @@ -831,7 +831,7 @@ asmlinkage long sys_setfsuid(uid_t uid) /* * Samma på svenska.. */ -asmlinkage long sys_setfsgid(gid_t gid) +SYSCALL_DEFINE1(setfsgid, gid_t, gid) { int old_fsgid; @@ -1245,7 +1245,7 @@ int set_current_groups(struct group_info EXPORT_SYMBOL(set_current_groups); -asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist) +SYSCALL_DEFINE2(getgroups, int, gidsetsize, gid_t __user *, grouplist) { int i = 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/