diff options
author | Anton Blanchard <anton@samba.org> | 2005-07-07 20:56:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:37 -0400 |
commit | cf36680887d6d942d2119c1ff1dfb2428b0f21f4 (patch) | |
tree | 1290244377993179daabe5f2e0f3f636fbafbc47 | |
parent | 8dc4fd87f229414fc38648508aad7def2275fe81 (diff) |
[PATCH] move ioprio syscalls into syscalls.h
- Make ioprio syscalls return long, like set/getpriority syscalls.
- Move function prototypes into syscalls.h so we can pick them up in the
32/64bit compat code.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/ioprio.c | 4 | ||||
-rw-r--r-- | include/linux/ioprio.h | 3 | ||||
-rw-r--r-- | include/linux/syscalls.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index 663e420636d6..97e1f088ba00 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c | |||
@@ -43,7 +43,7 @@ static int set_task_ioprio(struct task_struct *task, int ioprio) | |||
43 | return 0; | 43 | return 0; |
44 | } | 44 | } |
45 | 45 | ||
46 | asmlinkage int sys_ioprio_set(int which, int who, int ioprio) | 46 | asmlinkage long sys_ioprio_set(int which, int who, int ioprio) |
47 | { | 47 | { |
48 | int class = IOPRIO_PRIO_CLASS(ioprio); | 48 | int class = IOPRIO_PRIO_CLASS(ioprio); |
49 | int data = IOPRIO_PRIO_DATA(ioprio); | 49 | int data = IOPRIO_PRIO_DATA(ioprio); |
@@ -115,7 +115,7 @@ asmlinkage int sys_ioprio_set(int which, int who, int ioprio) | |||
115 | return ret; | 115 | return ret; |
116 | } | 116 | } |
117 | 117 | ||
118 | asmlinkage int sys_ioprio_get(int which, int who) | 118 | asmlinkage long sys_ioprio_get(int which, int who) |
119 | { | 119 | { |
120 | struct task_struct *g, *p; | 120 | struct task_struct *g, *p; |
121 | struct user_struct *user; | 121 | struct user_struct *user; |
diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h index 8a453a0b5e4b..88d5961f7a3f 100644 --- a/include/linux/ioprio.h +++ b/include/linux/ioprio.h | |||
@@ -34,9 +34,6 @@ enum { | |||
34 | */ | 34 | */ |
35 | #define IOPRIO_BE_NR (8) | 35 | #define IOPRIO_BE_NR (8) |
36 | 36 | ||
37 | asmlinkage int sys_ioprio_set(int, int, int); | ||
38 | asmlinkage int sys_ioprio_get(int, int); | ||
39 | |||
40 | enum { | 37 | enum { |
41 | IOPRIO_WHO_PROCESS = 1, | 38 | IOPRIO_WHO_PROCESS = 1, |
42 | IOPRIO_WHO_PGRP, | 39 | IOPRIO_WHO_PGRP, |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 52830b6d94e5..425f58c8ea4a 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -506,4 +506,7 @@ asmlinkage long sys_request_key(const char __user *_type, | |||
506 | asmlinkage long sys_keyctl(int cmd, unsigned long arg2, unsigned long arg3, | 506 | asmlinkage long sys_keyctl(int cmd, unsigned long arg2, unsigned long arg3, |
507 | unsigned long arg4, unsigned long arg5); | 507 | unsigned long arg4, unsigned long arg5); |
508 | 508 | ||
509 | asmlinkage long sys_ioprio_set(int which, int who, int ioprio); | ||
510 | asmlinkage long sys_ioprio_get(int which, int who); | ||
511 | |||
509 | #endif | 512 | #endif |