diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-27 14:28:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-27 14:28:09 +0200 |
| commit | d6a72fe465f4c54654a1d5488daeb820b4ecf275 (patch) | |
| tree | 1b581d3b3452b47ba35e1ee3c96d05c030ed9726 /arch/s390 | |
| parent | b1d2dc3c06d8da7d58fb43d7123a91c1d6a4f576 (diff) | |
| parent | b1cff0ad1062621ae63cb6c5dc4165191fe2e9f1 (diff) | |
| download | linux-d6a72fe465f4c54654a1d5488daeb820b4ecf275.tar.gz linux-d6a72fe465f4c54654a1d5488daeb820b4ecf275.tar.bz2 linux-d6a72fe465f4c54654a1d5488daeb820b4ecf275.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/mm/maccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c index 71a4b0d34be0..51e5cd9b906a 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c @@ -19,7 +19,7 @@ * using the stura instruction. * Returns the number of bytes copied or -EFAULT. */ -static long probe_kernel_write_odd(void *dst, void *src, size_t size) +static long probe_kernel_write_odd(void *dst, const void *src, size_t size) { unsigned long count, aligned; int offset, mask; @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size) return rc ? rc : count; } -long probe_kernel_write(void *dst, void *src, size_t size) +long probe_kernel_write(void *dst, const void *src, size_t size) { long copied = 0; |