diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:54:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:54:54 +0200 |
| commit | 8be7eb359d96a6503de18b1a73fd6a24d8c983c9 (patch) | |
| tree | 36795b7369a137ab6663bc018d452b58bf1d5e72 /arch/tile/include/asm/compat.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff) | |
| parent | arch/tile: fix formatting bug in register dumps (diff) | |
| download | linux-8be7eb359d96a6503de18b1a73fd6a24d8c983c9.tar.xz linux-8be7eb359d96a6503de18b1a73fd6a24d8c983c9.zip | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: fix formatting bug in register dumps
arch/tile: fix memcpy_fromio()/memcpy_toio() signatures
arch/tile: Save and restore extra user state for tilegx
arch/tile: Change struct sigcontext to be more useful
arch/tile: finish const-ifying sys_execve()
Diffstat (limited to 'arch/tile/include/asm/compat.h')
| -rw-r--r-- | arch/tile/include/asm/compat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h index 345d81ce44bb..8b60ec8b2d19 100644 --- a/arch/tile/include/asm/compat.h +++ b/arch/tile/include/asm/compat.h @@ -214,8 +214,9 @@ extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka, struct compat_sigaction; struct compat_siginfo; struct compat_sigaltstack; -long compat_sys_execve(char __user *path, compat_uptr_t __user *argv, - compat_uptr_t __user *envp); +long compat_sys_execve(const char __user *path, + const compat_uptr_t __user *argv, + const compat_uptr_t __user *envp); long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act, struct compat_sigaction __user *oact, size_t sigsetsize); |