From owner-svn-src-user@FreeBSD.ORG  Fri Mar 29 03:45:59 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 56D3C9AE;
 Fri, 29 Mar 2013 03:45:59 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 483A593E;
 Fri, 29 Mar 2013 03:45:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2T3jx05027549;
 Fri, 29 Mar 2013 03:45:59 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2T3jxqn027548;
 Fri, 29 Mar 2013 03:45:59 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201303290345.r2T3jxqn027548@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Fri, 29 Mar 2013 03:45:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248863 - user/attilio/membarclean/dev/virtio
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 03:45:59 -0000

Author: bryanv
Date: Fri Mar 29 03:45:58 2013
New Revision: 248863
URL: http://svnweb.freebsd.org/changeset/base/248863

Log:
  Revert what is left of r240427
  
  Ease the work of this branch by changing the write membar
  into just a membar.

Modified:
  user/attilio/membarclean/dev/virtio/virtqueue.c

Modified: user/attilio/membarclean/dev/virtio/virtqueue.c
==============================================================================
--- user/attilio/membarclean/dev/virtio/virtqueue.c	Fri Mar 29 02:14:57 2013	(r248862)
+++ user/attilio/membarclean/dev/virtio/virtqueue.c	Fri Mar 29 03:45:58 2013	(r248863)
@@ -622,7 +622,7 @@ vq_ring_update_avail(struct virtqueue *v
 	avail_idx = vq->vq_ring.avail->idx & (vq->vq_nentries - 1);
 	vq->vq_ring.avail->ring[avail_idx] = desc_idx;
 
-	wmb();
+	mb();
 	vq->vq_ring.avail->idx++;
 
 	/* Keep pending count until virtqueue_notify(). */