diff --git a/[refs] b/[refs] index f3be1e734e71..33613f38df5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3d0a0d96a7a2b4e1335437f68b3181ab252050a +refs/heads/master: d93f82b6e0c12a4373f2d04b1f92fcb2d175b62c diff --git a/trunk/mm/maccess.c b/trunk/mm/maccess.c index ac40796cfb15..9073695ff25f 100644 --- a/trunk/mm/maccess.c +++ b/trunk/mm/maccess.c @@ -39,7 +39,7 @@ EXPORT_SYMBOL_GPL(probe_kernel_read); * Safely write to address @dst from the buffer at @src. If a kernel fault * happens, handle that and return -EFAULT. */ -long probe_kernel_write(void *dst, void *src, size_t size) +long notrace __weak probe_kernel_write(void *dst, void *src, size_t size) { long ret; mm_segment_t old_fs = get_fs();