Merge tag 'v3.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

3 files changed, 7 insertions, 22 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 5438a2d7907f..d9a203b058f1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -999,7 +999,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         With this option on every unmap_single operation will
                         result in a hardware IOTLB flush operation as opposed
                         to batching them for performance.
-
+                sp_off [Default Off]
+                        By default, super page will be supported if Intel IOMMU
+                        has the capability. With this option, super page will
+                        not be supported.
         intremap=       [X86-64, Intel-IOMMU]
                         Format: { on (default) | off | nosid }
                         on      enable Interrupt Remapping (default)
diff --git a/Documentation/virtual/lguest/Makefile b/Documentation/virtual/lguest/Makefile
index bebac6b4f332..0ac34206f7a7 100644
--- a/Documentation/virtual/lguest/Makefile
+++ b/Documentation/virtual/lguest/Makefile
@@ -1,5 +1,5 @@
 # This creates the demonstration utility "lguest" which runs a Linux guest.
-# Missing headers?  Add "-I../../include -I../../arch/x86/include"
+# Missing headers?  Add "-I../../../include -I../../../arch/x86/include"
 CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE
 
 all: lguest
diff --git a/Documentation/virtual/lguest/lguest.c b/Documentation/virtual/lguest/lguest.c
index d9da7e148538..cd9d6af61d07 100644
--- a/Documentation/virtual/lguest/lguest.c
+++ b/Documentation/virtual/lguest/lguest.c
@@ -49,7 +49,7 @@
 #include <linux/virtio_rng.h>
 #include <linux/virtio_ring.h>
 #include <asm/bootparam.h>
-#include "../../include/linux/lguest_launcher.h"
+#include "../../../include/linux/lguest_launcher.h"
 /*L:110
  * We can ignore the 42 include files we need for this program, but I do want
  * to draw attention to the use of kernel-style types.
@@ -135,9 +135,6 @@ struct device {
         /* Is it operational */
         bool running;
 
-        /* Does Guest want an intrrupt on empty? */
-        bool irq_on_empty;
-
         /* Device-specific data. */
         void *priv;
 };
@@ -637,10 +634,7 @@ static void trigger_irq(struct virtqueue *vq)
 
         /* If they don't want an interrupt, don't send one... */
         if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) {
-                /* ... unless they've asked us to force one on empty. */
-                if (!vq->dev->irq_on_empty
-                    || lg_last_avail(vq) != vq->vring.avail->idx)
-                        return;
+                return;
         }
 
         /* Send the Guest an interrupt tell them we used something up. */
@@ -1057,15 +1051,6 @@ static void create_thread(struct virtqueue *vq)
         close(vq->eventfd);
 }
 
-static bool accepted_feature(struct device *dev, unsigned int bit)
-{
-        const u8 *features = get_feature_bits(dev) + dev->feature_len;
-
-        if (dev->feature_len < bit / CHAR_BIT)
-                return false;
-        return features[bit / CHAR_BIT] & (1 << (bit % CHAR_BIT));
-}
-
 static void start_device(struct device *dev)
 {
         unsigned int i;
@@ -1079,8 +1064,6 @@ static void start_device(struct device *dev)
                 verbose(" %02x", get_feature_bits(dev)
                         [dev->feature_len+i]);
 
-        dev->irq_on_empty = accepted_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
-
         for (vq = dev->vq; vq; vq = vq->next) {
                 if (vq->service)
                         create_thread(vq);
@@ -1564,7 +1547,6 @@ static void setup_tun_net(char *arg)
         /* Set up the tun device. */
         configure_device(ipfd, tapif, ip);
 
-        add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
         /* Expect Guest to handle everything except UFO */
         add_feature(dev, VIRTIO_NET_F_CSUM);
         add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);