diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /include/linux/syscalls.h | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 6e5d19788634..e6319d18a55d 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -820,7 +820,7 @@ asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags, | |||
| 820 | u64 mask, int fd, | 820 | u64 mask, int fd, |
| 821 | const char __user *pathname); | 821 | const char __user *pathname); |
| 822 | 822 | ||
| 823 | int kernel_execve(const char *filename, char *const argv[], char *const envp[]); | 823 | int kernel_execve(const char *filename, const char *const argv[], const char *const envp[]); |
| 824 | 824 | ||
| 825 | 825 | ||
| 826 | asmlinkage long sys_perf_event_open( | 826 | asmlinkage long sys_perf_event_open( |