Merge branch 'core/header-fixes' into x86/headers

Conflicts: arch/x86/include/asm/setup.h
2009-02-13 21:05:03 +01:00
parent bf33a70a73 0fb807c3e5
commit 22796b1572
36 changed files with 100 additions and 86 deletions
--- a/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@ -74,6 +74,7 @@ asmlinkage long sys_vfork(struct pt_regs *);
 asmlinkage long sys_execve(char __user *, char __user * __user *,
 			   char __user * __user *,
 			   struct pt_regs *);
+long sys_arch_prctl(int, unsigned long);

 /* kernel/ioport.c */
 asmlinkage long sys_iopl(unsigned int, struct pt_regs *);