diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /include/asm-generic/syscalls.h | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'include/asm-generic/syscalls.h')
| -rw-r--r-- | include/asm-generic/syscalls.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h index df84e3b04555..d89dec864d42 100644 --- a/include/asm-generic/syscalls.h +++ b/include/asm-generic/syscalls.h | |||
| @@ -23,8 +23,10 @@ asmlinkage long sys_vfork(struct pt_regs *regs); | |||
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | #ifndef sys_execve | 25 | #ifndef sys_execve |
| 26 | asmlinkage long sys_execve(char __user *filename, char __user * __user *argv, | 26 | asmlinkage long sys_execve(const char __user *filename, |
| 27 | char __user * __user *envp, struct pt_regs *regs); | 27 | const char __user *const __user *argv, |
| 28 | const char __user *const __user *envp, | ||
| 29 | struct pt_regs *regs); | ||
| 28 | #endif | 30 | #endif |
| 29 | 31 | ||
| 30 | #ifndef sys_mmap2 | 32 | #ifndef sys_mmap2 |