diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 17:27:20 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 17:27:28 +0200 |
| commit | 37eca0d64a2dbeece25969ec0698e1ff72bdcf39 (patch) | |
| tree | 54ba70f0428f586f4fe28d8b429b9f9e0799a17a /include/asm-generic/syscalls.h | |
| parent | lockup_detector: Make callback function static (diff) | |
| parent | Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| download | linux-37eca0d64a2dbeece25969ec0698e1ff72bdcf39.tar.gz linux-37eca0d64a2dbeece25969ec0698e1ff72bdcf39.zip | |
Merge branch 'linus' into core/locking
Reason: Pull in the semaphore related changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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); #endif #ifndef sys_execve -asmlinkage long sys_execve(char __user *filename, char __user * __user *argv, - char __user * __user *envp, struct pt_regs *regs); +asmlinkage long sys_execve(const char __user *filename, + const char __user *const __user *argv, + const char __user *const __user *envp, + struct pt_regs *regs); #endif #ifndef sys_mmap2 |