git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trace: stop all recording to ring buffer on ftrace_dump
[safe/jmp/linux-2.6]
/
kernel
/
sys.c
diff --git
a/kernel/sys.c
b/kernel/sys.c
index
ace9ced
..
e7dc0e1
100644
(file)
--- a/
kernel/sys.c
+++ b/
kernel/sys.c
@@
-143,7
+143,7
@@
out:
return error;
}
return error;
}
-
asmlinkage long sys_setpriority(int which, int who, int
niceval)
+
SYSCALL_DEFINE3(setpriority, int, which, int, who, int,
niceval)
{
struct task_struct *g, *p;
struct user_struct *user;
{
struct task_struct *g, *p;
struct user_struct *user;
@@
-208,7
+208,7
@@
out:
* has been offset by 20 (ie it returns 40..1 instead of -20..19)
* to stay compatible.
*/
* has been offset by 20 (ie it returns 40..1 instead of -20..19)
* to stay compatible.
*/
-
asmlinkage long sys_getpriority(int which, int
who)
+
SYSCALL_DEFINE2(getpriority, int, which, int,
who)
{
struct task_struct *g, *p;
struct user_struct *user;
{
struct task_struct *g, *p;
struct user_struct *user;
@@
-355,7
+355,8
@@
EXPORT_SYMBOL_GPL(kernel_power_off);
*
* reboot doesn't sync: do that yourself before calling this.
*/
*
* reboot doesn't sync: do that yourself before calling this.
*/
-asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user * arg)
+SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
+ void __user *, arg)
{
char buffer[256];
{
char buffer[256];
@@
-944,7
+945,7
@@
SYSCALL_DEFINE1(times, struct tms __user *, tbuf)
* Auch. Had to add the 'did_exec' flag to conform completely to POSIX.
* LBT 04.03.94
*/
* Auch. Had to add the 'did_exec' flag to conform completely to POSIX.
* LBT 04.03.94
*/
-
asmlinkage long sys_setpgid(pid_t pid, pid_t
pgid)
+
SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t,
pgid)
{
struct task_struct *p;
struct task_struct *group_leader = current->group_leader;
{
struct task_struct *p;
struct task_struct *group_leader = current->group_leader;
@@
-1080,7
+1081,7
@@
out:
return retval;
}
return retval;
}
-
asmlinkage long sys_setsid(vo
id)
+
SYSCALL_DEFINE0(sets
id)
{
struct task_struct *group_leader = current->group_leader;
struct pid *sid = task_pid(group_leader);
{
struct task_struct *group_leader = current->group_leader;
struct pid *sid = task_pid(group_leader);
@@
-1340,7
+1341,7
@@
out:
* without another task interfering.
*/
* without another task interfering.
*/
-
asmlinkage long sys_setgroups(int gidsetsize, gid_t __user *
grouplist)
+
SYSCALL_DEFINE2(setgroups, int, gidsetsize, gid_t __user *,
grouplist)
{
struct group_info *group_info;
int retval;
{
struct group_info *group_info;
int retval;
@@
-1394,7
+1395,7
@@
EXPORT_SYMBOL(in_egroup_p);
DECLARE_RWSEM(uts_sem);
DECLARE_RWSEM(uts_sem);
-
asmlinkage long sys_newuname(struct new_utsname __user *
name)
+
SYSCALL_DEFINE1(newuname, struct new_utsname __user *,
name)
{
int errno = 0;
{
int errno = 0;
@@
-1405,7
+1406,7
@@
asmlinkage long sys_newuname(struct new_utsname __user * name)
return errno;
}
return errno;
}
-
asmlinkage long sys_sethostname(char __user *name, int
len)
+
SYSCALL_DEFINE2(sethostname, char __user *, name, int,
len)
{
int errno;
char tmp[__NEW_UTS_LEN];
{
int errno;
char tmp[__NEW_UTS_LEN];
@@
-1429,7
+1430,7
@@
asmlinkage long sys_sethostname(char __user *name, int len)
#ifdef __ARCH_WANT_SYS_GETHOSTNAME
#ifdef __ARCH_WANT_SYS_GETHOSTNAME
-
asmlinkage long sys_gethostname(char __user *name, int
len)
+
SYSCALL_DEFINE2(gethostname, char __user *, name, int,
len)
{
int i, errno;
struct new_utsname *u;
{
int i, errno;
struct new_utsname *u;
@@
-1454,7
+1455,7
@@
asmlinkage long sys_gethostname(char __user *name, int len)
* Only setdomainname; getdomainname can be implemented by calling
* uname()
*/
* Only setdomainname; getdomainname can be implemented by calling
* uname()
*/
-
asmlinkage long sys_setdomainname(char __user *name, int
len)
+
SYSCALL_DEFINE2(setdomainname, char __user *, name, int,
len)
{
int errno;
char tmp[__NEW_UTS_LEN];
{
int errno;
char tmp[__NEW_UTS_LEN];
@@
-1477,7
+1478,7
@@
asmlinkage long sys_setdomainname(char __user *name, int len)
return errno;
}
return errno;
}
-
asmlinkage long sys_getrlimit(unsigned int resource, struct rlimit __user *
rlim)
+
SYSCALL_DEFINE2(getrlimit, unsigned int, resource, struct rlimit __user *,
rlim)
{
if (resource >= RLIM_NLIMITS)
return -EINVAL;
{
if (resource >= RLIM_NLIMITS)
return -EINVAL;
@@
-1496,7
+1497,8
@@
asmlinkage long sys_getrlimit(unsigned int resource, struct rlimit __user *rlim)
* Back compatibility for getrlimit. Needed for some apps.
*/
* Back compatibility for getrlimit. Needed for some apps.
*/
-asmlinkage long sys_old_getrlimit(unsigned int resource, struct rlimit __user *rlim)
+SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
+ struct rlimit __user *, rlim)
{
struct rlimit x;
if (resource >= RLIM_NLIMITS)
{
struct rlimit x;
if (resource >= RLIM_NLIMITS)
@@
-1514,7
+1516,7
@@
asmlinkage long sys_old_getrlimit(unsigned int resource, struct rlimit __user *r
#endif
#endif
-
asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *
rlim)
+
SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *,
rlim)
{
struct rlimit new_rlim, *old_rlim;
int retval;
{
struct rlimit new_rlim, *old_rlim;
int retval;
@@
-1687,7
+1689,7
@@
int getrusage(struct task_struct *p, int who, struct rusage __user *ru)
return copy_to_user(ru, &r, sizeof(r)) ? -EFAULT : 0;
}
return copy_to_user(ru, &r, sizeof(r)) ? -EFAULT : 0;
}
-
asmlinkage long sys_getrusage(int who, struct rusage __user *
ru)
+
SYSCALL_DEFINE2(getrusage, int, who, struct rusage __user *,
ru)
{
if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN &&
who != RUSAGE_THREAD)
{
if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN &&
who != RUSAGE_THREAD)
@@
-1695,14
+1697,14
@@
asmlinkage long sys_getrusage(int who, struct rusage __user *ru)
return getrusage(current, who, ru);
}
return getrusage(current, who, ru);
}
-
asmlinkage long sys_umask(int
mask)
+
SYSCALL_DEFINE1(umask, int,
mask)
{
mask = xchg(¤t->fs->umask, mask & S_IRWXUGO);
return mask;
}
{
mask = xchg(¤t->fs->umask, mask & S_IRWXUGO);
return mask;
}
-
asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long
arg3,
-
unsigned long arg4, unsigned long
arg5)
+
SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long,
arg3,
+
unsigned long, arg4, unsigned long,
arg5)
{
struct task_struct *me = current;
unsigned char comm[sizeof(me->comm)];
{
struct task_struct *me = current;
unsigned char comm[sizeof(me->comm)];
@@
-1815,8
+1817,8
@@
asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
return error;
}
return error;
}
-
asmlinkage long sys_getcpu(unsigned __user *cpup, unsigned __user *
nodep,
-
struct getcpu_cache __user *
unused)
+
SYSCALL_DEFINE3(getcpu, unsigned __user *, cpup, unsigned __user *,
nodep,
+
struct getcpu_cache __user *,
unused)
{
int err = 0;
int cpu = raw_smp_processor_id();
{
int err = 0;
int cpu = raw_smp_processor_id();