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/blackfin/mm | |
parent | b1d2dc3c06d8da7d58fb43d7123a91c1d6a4f576 (diff) | |
parent | b1cff0ad1062621ae63cb6c5dc4165191fe2e9f1 (diff) | |
download | blackbird-op-linux-d6a72fe465f4c54654a1d5488daeb820b4ecf275.tar.gz blackbird-op-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/blackfin/mm')
-rw-r--r-- | arch/blackfin/mm/maccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mm/maccess.c b/arch/blackfin/mm/maccess.c index b71cebc1f8a3..e2532114c5fd 100644 --- a/arch/blackfin/mm/maccess.c +++ b/arch/blackfin/mm/maccess.c @@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size) return bfin_mem_access_type(addr, size); } -long probe_kernel_read(void *dst, void *src, size_t size) +long probe_kernel_read(void *dst, const void *src, size_t size) { unsigned long lsrc = (unsigned long)src; int mem_type; @@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size) return -EFAULT; } -long probe_kernel_write(void *dst, void *src, size_t size) +long probe_kernel_write(void *dst, const void *src, size_t size) { unsigned long ldst = (unsigned long)dst; int mem_type; |