diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 10:09:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 10:09:59 -0700 |
| commit | f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c (patch) | |
| tree | 64e83b3cce9d8e659a48cd706c59c09dc183b6dc /include/asm-sparc64/unistd.h | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
| parent | f7ceba360cce9af3fbc4e5a5b1bd40b570b7021c (diff) | |
| download | talos-op-linux-f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c.tar.gz talos-op-linux-f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc64/unistd.h')
| -rw-r--r-- | include/asm-sparc64/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 5b8dcf5786a5..f59144c6b76a 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h @@ -212,7 +212,7 @@ #define __NR_epoll_create 193 /* Linux Specific */ #define __NR_epoll_ctl 194 /* Linux Specific */ #define __NR_epoll_wait 195 /* Linux Specific */ -/* #define __NR_ulimit 196 Linux Specific */ +#define __NR_ioprio_set 196 /* Linux Specific */ #define __NR_getppid 197 /* Linux Specific */ #define __NR_sigaction 198 /* Linux Specific */ #define __NR_sgetmask 199 /* Linux Specific */ @@ -234,7 +234,7 @@ #define __NR_ipc 215 /* Linux Specific */ #define __NR_sigreturn 216 /* Linux Specific */ #define __NR_clone 217 /* Linux Specific */ -/* #define __NR_modify_ldt 218 Linux Specific - i386 specific, unused */ +#define __NR_ioprio_get 218 /* Linux Specific */ #define __NR_adjtimex 219 /* Linux Specific */ #define __NR_sigprocmask 220 /* Linux Specific */ #define __NR_create_module 221 /* Linux Specific */ |
