diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-03 07:55:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-03 07:55:06 -0500 |
| commit | 87fe85133fa7f33c2bc9882826666a7f117c62bd (patch) | |
| tree | ab251f47a34b8c8c5b7c21aa45c818de926aa8d1 /arch/x86/include/asm/syscalls.h | |
| parent | 1ff8f739c7cc4eaa89b6ba986494f458ff7bdbef (diff) | |
| parent | 15c554439faedfa490389b31db893dc764245e88 (diff) | |
Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean into core/header-fixes
Diffstat (limited to 'arch/x86/include/asm/syscalls.h')
| -rw-r--r-- | arch/x86/include/asm/syscalls.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h index c0b0bda754ee..e26d34b0bc79 100644 --- 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 *); | |||
| 74 | asmlinkage long sys_execve(char __user *, char __user * __user *, | 74 | asmlinkage long sys_execve(char __user *, char __user * __user *, |
| 75 | char __user * __user *, | 75 | char __user * __user *, |
| 76 | struct pt_regs *); | 76 | struct pt_regs *); |
| 77 | long sys_arch_prctl(int, unsigned long); | ||
| 77 | 78 | ||
| 78 | /* kernel/ioport.c */ | 79 | /* kernel/ioport.c */ |
| 79 | asmlinkage long sys_iopl(unsigned int, struct pt_regs *); | 80 | asmlinkage long sys_iopl(unsigned int, struct pt_regs *); |