diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/linux/syscalls.h | |
parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/linux/syscalls.h')
-rw-r--r-- | include/linux/syscalls.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index e910d1a481df..3eed47347013 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -514,4 +514,9 @@ asmlinkage long sys_set_mempolicy(int mode, unsigned long __user *nmask, | |||
514 | asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, | 514 | asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, |
515 | const unsigned long __user *from, const unsigned long __user *to); | 515 | const unsigned long __user *from, const unsigned long __user *to); |
516 | 516 | ||
517 | asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, | ||
518 | __u32 __user *ustatus); | ||
519 | asmlinkage long sys_spu_create(const char __user *name, | ||
520 | unsigned int flags, mode_t mode); | ||
521 | |||
517 | #endif | 522 | #endif |