X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Fbackend_internal.h;h=e048365ec44578104a919294916aeeb1472ca432;hb=8170580a16ad989a2bc3698ba53e647922607aaf;hp=3e262c2e27f65ca7b8b3ea5ca50fdbb8a7b92824;hpb=886d51a3d7ed5fa6b41d7f19b3e14ae6c535a44c;p=lttng-modules.git diff --git a/lib/ringbuffer/backend_internal.h b/lib/ringbuffer/backend_internal.h index 3e262c2e..e048365e 100644 --- a/lib/ringbuffer/backend_internal.h +++ b/lib/ringbuffer/backend_internal.h @@ -56,7 +56,7 @@ extern void _lib_ring_buffer_write(struct lib_ring_buffer_backend *bufb, extern void _lib_ring_buffer_memset(struct lib_ring_buffer_backend *bufb, size_t offset, int c, size_t len, ssize_t pagecpy); -extern void _lib_ring_buffer_copy_from_user(struct lib_ring_buffer_backend *bufb, +extern void _lib_ring_buffer_copy_from_user_inatomic(struct lib_ring_buffer_backend *bufb, size_t offset, const void *src, size_t len, ssize_t pagecpy); @@ -434,15 +434,15 @@ do { \ } while (0) /* - * We use __copy_from_user to copy userspace data since we already + * We use __copy_from_user_inatomic to copy userspace data since we already * did the access_ok for the whole range. */ static inline -unsigned long lib_ring_buffer_do_copy_from_user(void *dest, +unsigned long lib_ring_buffer_do_copy_from_user_inatomic(void *dest, const void __user *src, unsigned long len) { - return __copy_from_user(dest, src, len); + return __copy_from_user_inatomic(dest, src, len); } /*