Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cf36680887d6d942d2119c1ff1dfb2428b0f21f4

Authored by Anton Blanchard
Committed by Linus Torvalds
1 parent 8dc4fd87f2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -43,7 +43,7 @@
43 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 48 int class = IOPRIO_PRIO_CLASS(ioprio);
49 49 int data = IOPRIO_PRIO_DATA(ioprio);
... ... @@ -115,7 +115,7 @@
115 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 120 struct task_struct *g, *p;
121 121 struct user_struct *user;
include/linux/ioprio.h
Diff comments   View file @ cf36680
... ... @@ -34,9 +34,6 @@
34 34 */
35 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 37 enum {
41 38 IOPRIO_WHO_PROCESS = 1,
42 39 IOPRIO_WHO_PGRP,
include/linux/syscalls.h
Diff comments   View file @ cf36680
... ... @@ -506,5 +506,8 @@
506 506 asmlinkage long sys_keyctl(int cmd, unsigned long arg2, unsigned long arg3,
507 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 512 #endif