Commit 9d1b972f authored by Mark Rutland's avatar Mark Rutland Committed by Michael S. Tsirkin

vringh: kill off ACCESS_ONCE()

Despite living under drivers/ vringh.c is also used as part of the userspace
virtio tools. Before we can kill off the ACCESS_ONCE()definition in the tools,
we must convert vringh.c to use {READ,WRITE}_ONCE().

This patch does so, along with the required include of <linux/compiler.h> for
the relevant definitions. The userspace tools provide their own definitions in
their own <linux/compiler.h>.
Signed-off-by: default avatarMark Rutland <>
Cc: Jason Wang <>
Cc: Michael S. Tsirkin <>
Signed-off-by: default avatarMichael S. Tsirkin <>
Reviewed-by: default avatarChristian Borntraeger <>
Reviewed-by: default avatarCornelia Huck <>
Reviewed-by: default avatarJason Wang <>
parent 5da889c7
......@@ -3,6 +3,7 @@
* Since these may be in userspace, we use (inline) accessors.
#include <linux/compiler.h>
#include <linux/module.h>
#include <linux/vringh.h>
#include <linux/virtio_ring.h>
......@@ -820,13 +821,13 @@ EXPORT_SYMBOL(vringh_need_notify_user);
static inline int getu16_kern(const struct vringh *vrh,
u16 *val, const __virtio16 *p)
*val = vringh16_to_cpu(vrh, ACCESS_ONCE(*p));
*val = vringh16_to_cpu(vrh, READ_ONCE(*p));
return 0;
static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
WRITE_ONCE(*p, cpu_to_vringh16(vrh, val));
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment