]> git.karo-electronics.de Git - linux-beck.git/commitdiff
tools/virtio: fix READ_ONCE()
authorMark Rutland <mark.rutland@arm.com>
Thu, 24 Nov 2016 10:25:12 +0000 (10:25 +0000)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 15 Dec 2016 22:13:36 +0000 (00:13 +0200)
The virtio tools implementation of READ_ONCE() has a single parameter called
'var', but erroneously refers to 'val' for its cast, and thus won't work unless
there's a variable of the correct type that happens to be called 'var'.

Fix this with s/var/val/, making READ_ONCE() work as expected regardless.

Fixes: a7c490333df3cff5 ("tools/virtio: use virt_xxx barriers")
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
tools/virtio/linux/compiler.h

index 845960e1cbf2f4c961518a6181e51e0078b967d0..c9ccfd42ec137d593913bffcca846e197d1cb9f4 100644 (file)
@@ -4,6 +4,6 @@
 #define WRITE_ONCE(var, val) \
        (*((volatile typeof(val) *)(&(var))) = (val))
 
-#define READ_ONCE(var) (*((volatile typeof(val) *)(&(var))))
+#define READ_ONCE(var) (*((volatile typeof(var) *)(&(var))))
 
 #endif