diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/x86/include/asm/syscalls.h | |
| parent | bf33a70a73876b163d62612e9567cbac6604ba7e (diff) | |
| parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 (diff) | |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
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 68b1be10cfad..258ef730aaa4 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 *); |