From eb257d895f6e48dac60543e061461ea644810153 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Mon, 11 May 2009 18:11:44 +0100
Subject: [PATCH] --- yaml --- r: 147967 b: refs/heads/master c:
 ee006b353f1ca8c9a8470b72b462beb011d62e32 h: refs/heads/master i:   147965:
 ca1c447a09ba4e9567c7b9ad05c4aae2bd36e08f   147963:
 3b198846b6654b1f30bd59549e97af5b8b138c53   147959:
 1c95ab73c0dc2b630bfaaf6fd3830fabdf04a17b   147951:
 92355784f0b10ac514e6143ae5c7bb3529f512a0   147935:
 a756f1413c62a5cd2fd9a688f6a2286643014886   147903:
 a9f0cb080c312d082954c665767ab796787ba5f2   147839:
 00146c8b2dae24a869791535cff2b20d46ca2a8c   147711:
 fb128f46dc04be4f1555bf0614ce5f1f07d3a7c1   147455:
 cada1d8d5107b95ef6be094bd663490652adfd4e v: v3

---
 [refs]                              | 2 +-
 trunk/include/linux/virtio_config.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0a7cb8baa9a..330a9c7c25e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a92892825a122a74ddad1d408fa27132e28b05ae
+refs/heads/master: ee006b353f1ca8c9a8470b72b462beb011d62e32
diff --git a/trunk/include/linux/virtio_config.h b/trunk/include/linux/virtio_config.h
index 4cd290c06a88..99f514575f6a 100644
--- a/trunk/include/linux/virtio_config.h
+++ b/trunk/include/linux/virtio_config.h
@@ -113,7 +113,9 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
 	if (__builtin_constant_p(fbit))
 		BUILD_BUG_ON(fbit >= 32);
 
-	virtio_check_driver_offered_feature(vdev, fbit);
+	if (fbit < VIRTIO_TRANSPORT_F_START)
+		virtio_check_driver_offered_feature(vdev, fbit);
+
 	return test_bit(fbit, vdev->features);
 }