summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/unistd.h
diff options
context:
space:
mode:
authorLinus Torvalds2005-07-11 19:09:59 +0200
committerLinus Torvalds2005-07-11 19:09:59 +0200
commitf43a64c5e1a65d12b9b53a35ed2d5db441fcb64c (patch)
tree64e83b3cce9d8e659a48cd706c59c09dc183b6dc /include/asm-sparc/unistd.h
parentMerge master.kernel.org:~rmk/linux-2.6-arm.git (diff)
parent[SPARC64]: Add syscall auditing support. (diff)
downloadkernel-qcow2-linux-f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c.tar.gz
kernel-qcow2-linux-f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c.tar.xz
kernel-qcow2-linux-f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/unistd.h')
-rw-r--r--include/asm-sparc/unistd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index 846708403900..aee17d7e2e44 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/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 */