From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 18:03:44 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
X-Git-Tag: firefly_0821_release~39402
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6150c32589d1976ca8a5c987df951088c05a7542;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/paulus/powerpc-merge
---

6150c32589d1976ca8a5c987df951088c05a7542
diff --cc include/linux/syscalls.h
index e910d1a481df,44fdd48d38e6..3eed47347013
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -511,7 -511,10 +511,12 @@@ asmlinkage long sys_ioprio_set(int whic
  asmlinkage long sys_ioprio_get(int which, int who);
  asmlinkage long sys_set_mempolicy(int mode, unsigned long __user *nmask,
  					unsigned long maxnode);
 +asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
 +			const unsigned long __user *from, const unsigned long __user *to);
  
+ asmlinkage long sys_spu_run(int fd, __u32 __user *unpc,
+ 				 __u32 __user *ustatus);
+ asmlinkage long sys_spu_create(const char __user *name,
+ 		unsigned int flags, mode_t mode);
+ 
  #endif