diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
| commit | 2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch) | |
| tree | c1e9868a4b91beeebd5f4e820588bc2ae8371911 /fs/ioprio.c | |
| parent | 42bb8cc5e81028e217105299001070d57eb84ad7 (diff) | |
| parent | adfafefd104d840ee4461965f22624d77532675b (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'fs/ioprio.c')
| -rw-r--r-- | fs/ioprio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index 1a39ac37094..c7c0b28d7d2 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c @@ -72,7 +72,7 @@ int set_task_ioprio(struct task_struct *task, int ioprio) } EXPORT_SYMBOL_GPL(set_task_ioprio); -asmlinkage long sys_ioprio_set(int which, int who, int ioprio) +SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio) { int class = IOPRIO_PRIO_CLASS(ioprio); int data = IOPRIO_PRIO_DATA(ioprio); @@ -188,7 +188,7 @@ int ioprio_best(unsigned short aprio, unsigned short bprio) return aprio; } -asmlinkage long sys_ioprio_get(int which, int who) +SYSCALL_DEFINE2(ioprio_get, int, which, int, who) { struct task_struct *g, *p; struct user_struct *user; @@ -252,4 +252,3 @@ asmlinkage long sys_ioprio_get(int which, int who) read_unlock(&tasklist_lock); return ret; } - |