From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39296)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YOCUn-0008P6-U8
	for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:49:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YOCUn-0004YB-2U
	for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:49:25 -0500
Received: from mail.kernel.org ([198.145.29.136]:51951)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YOCUm-0004Xy-U1
	for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:49:25 -0500
Date: Wed, 18 Feb 2015 22:49:19 +0100
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <1424295164-4774-54-git-send-email-mst@redhat.com>
References: <1424295164-4774-1-git-send-email-mst@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1424295164-4774-1-git-send-email-mst@redhat.com>
Subject: [Qemu-devel] [PULL 53/96] update-linux-headers.sh:
	s/__inline__/inline/
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, Alexander Graf <agraf@suse.de>, Thomas Huth <thuth@linux.vnet.ibm.com>, dgilbert@redhat.com, Juan Quintela <quintela@redhat.com>

Thomas Huth noticed that some linux headers
use __inline__, change to inline to be consistent
with the rest of QEMU.

Reported-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 scripts/update-linux-headers.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 9680e27..f208ec9 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -53,6 +53,7 @@ cp_virtio() {
                 -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
                 -e 's/__bitwise__//' \
                 -e 's/__attribute__((packed))/QEMU_PACKED/' \
+                -e 's/__inline__/inline/' \
                 "$f" > "$to/$header";
         done
     fi
-- 
MST