24 files changed, 220 insertions, 166 deletions

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 2afb3d2086b3..9f11dc296cdd 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -102,6 +102,8 @@ static struct acpi_driver acpi_processor_driver = {
                 .add = acpi_processor_add,
                 .remove = acpi_processor_remove,
                 .start = acpi_processor_start,
+                .suspend = acpi_processor_suspend,
+                .resume = acpi_processor_resume,
                 },
 };
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index d9b8af763e1e..f18261368e76 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -325,6 +325,23 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr,
 
 #endif
 
+/*
+ * Suspend / resume control
+ */
+static int acpi_idle_suspend;
+
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
+{
+        acpi_idle_suspend = 1;
+        return 0;
+}
+
+int acpi_processor_resume(struct acpi_device * device)
+{
+        acpi_idle_suspend = 0;
+        return 0;
+}
+
 static void acpi_processor_idle(void)
 {
         struct acpi_processor *pr = NULL;
@@ -355,7 +372,7 @@ static void acpi_processor_idle(void)
         }
 
         cx = pr->power.state;
-        if (!cx) {
+        if (!cx || acpi_idle_suspend) {
                 if (pm_idle_save)
                         pm_idle_save();
                 else
diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
index 195a4f69c0f7..f1fb888c2d29 100644
--- a/drivers/acpi/sleep/Makefile
+++ b/drivers/acpi/sleep/Makefile
@@ -1,5 +1,5 @@
-obj-y                                   := poweroff.o wakeup.o
-obj-$(CONFIG_ACPI_SLEEP)                += main.o
+obj-y                                   := wakeup.o
+obj-y                                   += main.o
 obj-$(CONFIG_ACPI_SLEEP)                += proc.o
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index c52ade816fb4..2cbb9aabd00e 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -15,13 +15,39 @@
 #include <linux/dmi.h>
 #include <linux/device.h>
 #include <linux/suspend.h>
+
+#include <asm/io.h>
+
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include "sleep.h"
 
 u8 sleep_states[ACPI_S_STATE_COUNT];
 
+#ifdef CONFIG_PM_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+#endif
+
+int acpi_sleep_prepare(u32 acpi_state)
+{
+#ifdef CONFIG_ACPI_SLEEP
+        /* do we have a wakeup address for S2 and S3? */
+        if (acpi_state == ACPI_STATE_S3) {
+                if (!acpi_wakeup_address) {
+                        return -EFAULT;
+                }
+                acpi_set_firmware_waking_vector((acpi_physical_address)
+                                                virt_to_phys((void *)
+                                                             acpi_wakeup_address));
+
+        }
+        ACPI_FLUSH_CPU_CACHE();
+        acpi_enable_wakeup_device_prep(acpi_state);
+#endif
+        acpi_gpe_sleep_prepare(acpi_state);
+        acpi_enter_sleep_state_prep(acpi_state);
+        return 0;
+}
 
 #ifdef CONFIG_SUSPEND
 static struct pm_ops acpi_pm_ops;
@@ -275,6 +301,7 @@ int acpi_suspend(u32 acpi_state)
         return -EINVAL;
 }
 
+#ifdef CONFIG_PM_SLEEP
 /**
  *      acpi_pm_device_sleep_state - return preferred power state of ACPI device
  *              in the system sleep state given by %acpi_target_sleep_state
@@ -349,6 +376,21 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
                 *d_min_p = d_min;
         return d_max;
 }
+#endif
+
+static void acpi_power_off_prepare(void)
+{
+        /* Prepare to power off the system */
+        acpi_sleep_prepare(ACPI_STATE_S5);
+}
+
+static void acpi_power_off(void)
+{
+        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
+        printk("%s called\n", __FUNCTION__);
+        local_irq_disable();
+        acpi_enter_sleep_state(ACPI_STATE_S5);
+}
 
 int __init acpi_sleep_init(void)
 {
@@ -363,16 +405,17 @@ int __init acpi_sleep_init(void)
         if (acpi_disabled)
                 return 0;
 
+        sleep_states[ACPI_STATE_S0] = 1;
+        printk(KERN_INFO PREFIX "(supports S0");
+
 #ifdef CONFIG_SUSPEND
-        printk(KERN_INFO PREFIX "(supports");
-        for (i = ACPI_STATE_S0; i < ACPI_STATE_S4; i++) {
+        for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) {
                 status = acpi_get_sleep_type_data(i, &type_a, &type_b);
                 if (ACPI_SUCCESS(status)) {
                         sleep_states[i] = 1;
                         printk(" S%d", i);
                 }
         }
-        printk(")\n");
 
         pm_set_ops(&acpi_pm_ops);
 #endif
@@ -382,10 +425,16 @@ int __init acpi_sleep_init(void)
         if (ACPI_SUCCESS(status)) {
                 hibernation_set_ops(&acpi_hibernation_ops);
                 sleep_states[ACPI_STATE_S4] = 1;
+                printk(" S4");
         }
-#else
-        sleep_states[ACPI_STATE_S4] = 0;
 #endif
-
+        status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
+        if (ACPI_SUCCESS(status)) {
+                sleep_states[ACPI_STATE_S5] = 1;
+                printk(" S5");
+                pm_power_off_prepare = acpi_power_off_prepare;
+                pm_power_off = acpi_power_off;
+        }
+        printk(")\n");
         return 0;
 }
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
deleted file mode 100644
index 39e40d56b034..000000000000
--- a/drivers/acpi/sleep/poweroff.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * poweroff.c - ACPI handler for powering off the system.
- *
- * AKA S5, but it is independent of whether or not the kernel supports
- * any other sleep support in the system.
- *
- * Copyright (c) 2005 Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
- *
- * This file is released under the GPLv2.
- */
-
-#include <linux/pm.h>
-#include <linux/init.h>
-#include <acpi/acpi_bus.h>
-#include <linux/sysdev.h>
-#include <asm/io.h>
-#include "sleep.h"
-
-int acpi_sleep_prepare(u32 acpi_state)
-{
-#ifdef CONFIG_ACPI_SLEEP
-        /* do we have a wakeup address for S2 and S3? */
-        if (acpi_state == ACPI_STATE_S3) {
-                if (!acpi_wakeup_address) {
-                        return -EFAULT;
-                }
-                acpi_set_firmware_waking_vector((acpi_physical_address)
-                                                virt_to_phys((void *)
-                                                             acpi_wakeup_address));
-
-        }
-        ACPI_FLUSH_CPU_CACHE();
-        acpi_enable_wakeup_device_prep(acpi_state);
-#endif
-        acpi_gpe_sleep_prepare(acpi_state);
-        acpi_enter_sleep_state_prep(acpi_state);
-        return 0;
-}
-
-#ifdef CONFIG_PM
-
-static void acpi_power_off_prepare(void)
-{
-        /* Prepare to power off the system */
-        acpi_sleep_prepare(ACPI_STATE_S5);
-}
-
-static void acpi_power_off(void)
-{
-        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
-        printk("%s called\n", __FUNCTION__);
-        local_irq_disable();
-        /* Some SMP machines only can poweroff in boot CPU */
-        acpi_enter_sleep_state(ACPI_STATE_S5);
-}
-
-static int acpi_poweroff_init(void)
-{
-        if (!acpi_disabled) {
-                u8 type_a, type_b;
-                acpi_status status;
-
-                status =
-                    acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
-                if (ACPI_SUCCESS(status)) {
-                        pm_power_off_prepare = acpi_power_off_prepare;
-                        pm_power_off = acpi_power_off;
-                }
-        }
-        return 0;
-}
-
-late_initcall(acpi_poweroff_init);
-
-#endif                          /* CONFIG_PM */
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 3c9bb85a6a93..d05891f16282 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -417,7 +417,6 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
         arg0.integer.value = level;
         status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 
-        printk(KERN_DEBUG "set_level status: %x\n", status);
         return status;
 }
 
@@ -1754,7 +1753,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 
 static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
 {
-        return acpi_video_bus_DOS(video, 1, 0);
+        return acpi_video_bus_DOS(video, 0, 0);
 }
 
 static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 2bd7645f1a88..cce2834b2b60 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -375,8 +375,9 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
         int drive_pci = sis_old_port_base(adev);
         u16 timing;
 
+        /* MWDMA 0-2 and UDMA 0-5 */
         const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
-        const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
+        const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000, 0x8000 };
 
         pci_read_config_word(pdev, drive_pci, &timing);
 
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index ef83e6b1e314..233e88693395 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -888,6 +888,16 @@ static inline void sil24_host_intr(struct ata_port *ap)
         u32 slot_stat, qc_active;
         int rc;
 
+        /* If PCIX_IRQ_WOC, there's an inherent race window between
+         * clearing IRQ pending status and reading PORT_SLOT_STAT
+         * which may cause spurious interrupts afterwards.  This is
+         * unavoidable and much better than losing interrupts which
+         * happens if IRQ pending is cleared after reading
+         * PORT_SLOT_STAT.
+         */
+        if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
+                writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
+
         slot_stat = readl(port + PORT_SLOT_STAT);
 
         if (unlikely(slot_stat & HOST_SSTAT_ATTN)) {
@@ -895,9 +905,6 @@ static inline void sil24_host_intr(struct ata_port *ap)
                 return;
         }
 
-        if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
-                writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
-
         qc_active = slot_stat & ~HOST_SSTAT_ATTN;
         rc = ata_qc_complete_multiple(ap, qc_active, sil24_finish_qc);
         if (rc > 0)
@@ -910,7 +917,8 @@ static inline void sil24_host_intr(struct ata_port *ap)
                 return;
         }
 
-        if (ata_ratelimit())
+        /* spurious interrupts are expected if PCIX_IRQ_WOC */
+        if (!(ap->flags & SIL24_FLAG_PCIX_IRQ_WOC) && ata_ratelimit())
                 ata_port_printk(ap, KERN_INFO, "spurious interrupt "
                         "(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
                         slot_stat, ap->active_tag, ap->sactive);
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 67ee3d4b2878..79245714f0a7 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1032,6 +1032,10 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
         check_disk_change(ip->i_bdev);
         return 0;
 err_release:
+        if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) {
+                cdi->ops->lock_door(cdi, 0);
+                cdinfo(CD_OPEN, "door unlocked.\n");
+        }
         cdi->ops->release(cdi);
 err:
         cdi->use_count--;
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 7ecffc9c738f..fd51554ab081 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -943,14 +943,14 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                         printk(KERN_DEBUG "%s: 0x%lx is busy\n",
                                 __FUNCTION__, hdp->hd_phys_address);
                         iounmap(hdp->hd_address);
-                        return -EBUSY;
+                        return AE_ALREADY_EXISTS;
                 }
         } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
                 struct acpi_resource_fixed_memory32 *fixmem32;
 
                 fixmem32 = &res->data.fixed_memory32;
                 if (!fixmem32)
-                        return -EINVAL;
+                        return AE_NO_MEMORY;
 
                 hdp->hd_phys_address = fixmem32->address;
                 hdp->hd_address = ioremap(fixmem32->address,
@@ -960,7 +960,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                         printk(KERN_DEBUG "%s: 0x%lx is busy\n",
                                 __FUNCTION__, hdp->hd_phys_address);
                         iounmap(hdp->hd_address);
-                        return -EBUSY;
+                        return AE_ALREADY_EXISTS;
                 }
         } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
                 struct acpi_resource_extended_irq *irqp;
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index 049a46cc9f87..04ac155d3a07 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -155,23 +155,22 @@ mspec_open(struct vm_area_struct *vma)
  * mspec_close
  *
  * Called when unmapping a device mapping. Frees all mspec pages
- * belonging to the vma.
+ * belonging to all the vma's sharing this vma_data structure.
  */
 static void
 mspec_close(struct vm_area_struct *vma)
 {
         struct vma_data *vdata;
-        int index, last_index, result;
+        int index, last_index;
         unsigned long my_page;
 
         vdata = vma->vm_private_data;
 
-        BUG_ON(vma->vm_start < vdata->vm_start || vma->vm_end > vdata->vm_end);
+        if (!atomic_dec_and_test(&vdata->refcnt))
+                return;
 
-        spin_lock(&vdata->lock);
-        index = (vma->vm_start - vdata->vm_start) >> PAGE_SHIFT;
-        last_index = (vma->vm_end - vdata->vm_start) >> PAGE_SHIFT;
-        for (; index < last_index; index++) {
+        last_index = (vdata->vm_end - vdata->vm_start) >> PAGE_SHIFT;
+        for (index = 0; index < last_index; index++) {
                 if (vdata->maddr[index] == 0)
                         continue;
                 /*
@@ -180,20 +179,12 @@ mspec_close(struct vm_area_struct *vma)
                  */
                 my_page = vdata->maddr[index];
                 vdata->maddr[index] = 0;
-                spin_unlock(&vdata->lock);
-                result = mspec_zero_block(my_page, PAGE_SIZE);
-                if (!result)
+                if (!mspec_zero_block(my_page, PAGE_SIZE))
                         uncached_free_page(my_page);
                 else
                         printk(KERN_WARNING "mspec_close(): "
-                               "failed to zero page %i\n",
-                               result);
-                spin_lock(&vdata->lock);
+                               "failed to zero page %ld\n", my_page);
         }
-        spin_unlock(&vdata->lock);
-
-        if (!atomic_dec_and_test(&vdata->refcnt))
-                return;
 
         if (vdata->flags & VMD_VMALLOCED)
                 vfree(vdata);
@@ -201,7 +192,6 @@ mspec_close(struct vm_area_struct *vma)
                 kfree(vdata);
 }
 
-
 /*
  * mspec_nopfn
  *
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index ba0428d872aa..85c51bdc36f1 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1211,12 +1211,42 @@ static void set_datagram_seg(struct mlx4_wqe_datagram_seg *dseg,
         dseg->qkey = cpu_to_be32(wr->wr.ud.remote_qkey);
 }
 
-static void set_data_seg(struct mlx4_wqe_data_seg *dseg,
-                         struct ib_sge *sg)
+static void set_mlx_icrc_seg(void *dseg)
+{
+        u32 *t = dseg;
+        struct mlx4_wqe_inline_seg *iseg = dseg;
+
+        t[1] = 0;
+
+        /*
+         * Need a barrier here before writing the byte_count field to
+         * make sure that all the data is visible before the
+         * byte_count field is set.  Otherwise, if the segment begins
+         * a new cacheline, the HCA prefetcher could grab the 64-byte
+         * chunk and get a valid (!= * 0xffffffff) byte count but
+         * stale data, and end up sending the wrong data.
+         */
+        wmb();
+
+        iseg->byte_count = cpu_to_be32((1 << 31) | 4);
+}
+
+static void set_data_seg(struct mlx4_wqe_data_seg *dseg, struct ib_sge *sg)
 {
-        dseg->byte_count = cpu_to_be32(sg->length);
         dseg->lkey       = cpu_to_be32(sg->lkey);
         dseg->addr       = cpu_to_be64(sg->addr);
+
+        /*
+         * Need a barrier here before writing the byte_count field to
+         * make sure that all the data is visible before the
+         * byte_count field is set.  Otherwise, if the segment begins
+         * a new cacheline, the HCA prefetcher could grab the 64-byte
+         * chunk and get a valid (!= * 0xffffffff) byte count but
+         * stale data, and end up sending the wrong data.
+         */
+        wmb();
+
+        dseg->byte_count = cpu_to_be32(sg->length);
 }
 
 int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
@@ -1225,6 +1255,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         struct mlx4_ib_qp *qp = to_mqp(ibqp);
         void *wqe;
         struct mlx4_wqe_ctrl_seg *ctrl;
+        struct mlx4_wqe_data_seg *dseg;
         unsigned long flags;
         int nreq;
         int err = 0;
@@ -1324,22 +1355,27 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                         break;
                 }
 
-                for (i = 0; i < wr->num_sge; ++i) {
-                        set_data_seg(wqe, wr->sg_list + i);
+                /*
+                 * Write data segments in reverse order, so as to
+                 * overwrite cacheline stamp last within each
+                 * cacheline.  This avoids issues with WQE
+                 * prefetching.
+                 */
 
-                        wqe  += sizeof (struct mlx4_wqe_data_seg);
-                        size += sizeof (struct mlx4_wqe_data_seg) / 16;
-                }
+                dseg = wqe;
+                dseg += wr->num_sge - 1;
+                size += wr->num_sge * (sizeof (struct mlx4_wqe_data_seg) / 16);
 
                 /* Add one more inline data segment for ICRC for MLX sends */
-                if (qp->ibqp.qp_type == IB_QPT_SMI || qp->ibqp.qp_type == IB_QPT_GSI) {
-                        ((struct mlx4_wqe_inline_seg *) wqe)->byte_count =
-                                cpu_to_be32((1 << 31) | 4);
-                        ((u32 *) wqe)[1] = 0;
-                        wqe  += sizeof (struct mlx4_wqe_data_seg);
+                if (unlikely(qp->ibqp.qp_type == IB_QPT_SMI ||
+                             qp->ibqp.qp_type == IB_QPT_GSI)) {
+                        set_mlx_icrc_seg(dseg + 1);
                         size += sizeof (struct mlx4_wqe_data_seg) / 16;
                 }
 
+                for (i = wr->num_sge - 1; i >= 0; --i, --dseg)
+                        set_data_seg(dseg, wr->sg_list + i);
+
                 ctrl->fence_size = (wr->send_flags & IB_SEND_FENCE ?
                                     MLX4_WQE_CTRL_FENCE : 0) | size;
 
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 2bea1b2c631c..a1804bfdbb8c 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -328,6 +328,7 @@ static void atp_complete(struct urb* urb)
 {
         int x, y, x_z, y_z, x_f, y_f;
         int retval, i, j;
+        int key;
         struct atp *dev = urb->context;
 
         switch (urb->status) {
@@ -468,6 +469,7 @@ static void atp_complete(struct urb* urb)
                               ATP_XFACT, &x_z, &x_f);
         y = atp_calculate_abs(dev->xy_acc + ATP_XSENSORS, ATP_YSENSORS,
                               ATP_YFACT, &y_z, &y_f);
+        key = dev->data[dev->datalen - 1] & 1;
 
         if (x && y) {
                 if (dev->x_old != -1) {
@@ -505,7 +507,7 @@ static void atp_complete(struct urb* urb)
                    the first touch unless reinitialised. Do so if it's been
                    idle for a while in order to avoid waking the kernel up
                    several hundred times a second */
-                if (atp_is_geyser_3(dev)) {
+                if (!key && atp_is_geyser_3(dev)) {
                         dev->idlecount++;
                         if (dev->idlecount == 10) {
                                 dev->valid = 0;
@@ -514,7 +516,7 @@ static void atp_complete(struct urb* urb)
                 }
         }
 
-        input_report_key(dev->input, BTN_LEFT, dev->data[dev->datalen - 1] & 1);
+        input_report_key(dev->input, BTN_LEFT, key);
         input_sync(dev->input);
 
 exit:
diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 7b64fd4aa2f3..0a419a0de603 100644
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -6,7 +6,8 @@ menuconfig VIRTUALIZATION
         depends on X86
         default y
         ---help---
-          Say Y here to get to see options for virtualization guest drivers.
+          Say Y here to get to see options for using your Linux host to run other
+          operating systems inside virtual machines (guests).
           This option alone does not add any kernel code.
 
           If you say N, all options in this submenu will be skipped and disabled.
diff --git a/drivers/lguest/lguest_asm.S b/drivers/lguest/lguest_asm.S
index f182c6a36209..1ddcd5cd20f6 100644
--- a/drivers/lguest/lguest_asm.S
+++ b/drivers/lguest/lguest_asm.S
@@ -22,8 +22,9 @@
         jmp lguest_init
 
 /*G:055 We create a macro which puts the assembler code between lgstart_ and
- * lgend_ markers.  These templates end up in the .init.text section, so they
- * are discarded after boot. */
+ * lgend_ markers.  These templates are put in the .text section: they can't be
+ * discarded after boot as we may need to patch modules, too. */
+.text
 #define LGUEST_PATCH(name, insns...)                    \
         lgstart_##name: insns; lgend_##name:;           \
         .globl lgstart_##name; .globl lgend_##name
@@ -34,7 +35,6 @@ LGUEST_PATCH(popf, movl %eax, lguest_data+LGUEST_DATA_irq_enabled)
 LGUEST_PATCH(pushf, movl lguest_data+LGUEST_DATA_irq_enabled, %eax)
 /*:*/
 
-.text
 /* These demark the EIP range where host should never deliver interrupts. */
 .global lguest_noirq_start
 .global lguest_noirq_end
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 4d63773ee73a..f96dea975fa5 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -514,7 +514,7 @@ static void ops_complete_biofill(void *stripe_head_ref)
         struct stripe_head *sh = stripe_head_ref;
         struct bio *return_bi = NULL;
         raid5_conf_t *conf = sh->raid_conf;
-        int i, more_to_read = 0;
+        int i;
 
         pr_debug("%s: stripe %llu\n", __FUNCTION__,
                 (unsigned long long)sh->sector);
@@ -522,16 +522,14 @@ static void ops_complete_biofill(void *stripe_head_ref)
         /* clear completed biofills */
         for (i = sh->disks; i--; ) {
                 struct r5dev *dev = &sh->dev[i];
-                /* check if this stripe has new incoming reads */
-                if (dev->toread)
-                        more_to_read++;
 
                 /* acknowledge completion of a biofill operation */
-                /* and check if we need to reply to a read request
-                */
-                if (test_bit(R5_Wantfill, &dev->flags) && !dev->toread) {
+                /* and check if we need to reply to a read request,
+                 * new R5_Wantfill requests are held off until
+                 * !test_bit(STRIPE_OP_BIOFILL, &sh->ops.pending)
+                 */
+                if (test_and_clear_bit(R5_Wantfill, &dev->flags)) {
                         struct bio *rbi, *rbi2;
-                        clear_bit(R5_Wantfill, &dev->flags);
 
                         /* The access to dev->read is outside of the
                          * spin_lock_irq(&conf->device_lock), but is protected
@@ -558,8 +556,7 @@ static void ops_complete_biofill(void *stripe_head_ref)
 
         return_io(return_bi);
 
-        if (more_to_read)
-                set_bit(STRIPE_HANDLE, &sh->state);
+        set_bit(STRIPE_HANDLE, &sh->state);
         release_stripe(sh);
 }
 
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index c06cae3f0b56..503f2685fb73 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -116,7 +116,7 @@ struct el3_private {
     spinlock_t          lock;
 };
 
-static const char *if_names[] = { "auto", "10base2", "10baseT", "AUI" };
+static const char *if_names[] = { "auto", "10baseT", "10base2", "AUI" };
 
 /*====================================================================*/
 
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index f79cf87a2bff..c0b6d19d1457 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -136,7 +136,7 @@ struct ppp_mppe_state {
  * Key Derivation, from RFC 3078, RFC 3079.
  * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079.
  */
-static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *InterimKey)
+static void get_new_key_from_sha(struct ppp_mppe_state * state)
 {
         struct hash_desc desc;
         struct scatterlist sg[4];
@@ -153,8 +153,6 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I
         desc.flags = 0;
 
         crypto_hash_digest(&desc, sg, nbytes, state->sha1_digest);
-
-        memcpy(InterimKey, state->sha1_digest, state->keylen);
 }
 
 /*
@@ -163,21 +161,21 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I
  */
 static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
 {
-        unsigned char InterimKey[MPPE_MAX_KEY_LEN];
         struct scatterlist sg_in[1], sg_out[1];
         struct blkcipher_desc desc = { .tfm = state->arc4 };
 
-        get_new_key_from_sha(state, InterimKey);
+        get_new_key_from_sha(state);
         if (!initial_key) {
-                crypto_blkcipher_setkey(state->arc4, InterimKey, state->keylen);
-                setup_sg(sg_in, InterimKey, state->keylen);
+                crypto_blkcipher_setkey(state->arc4, state->sha1_digest,
+                                        state->keylen);
+                setup_sg(sg_in, state->sha1_digest, state->keylen);
                 setup_sg(sg_out, state->session_key, state->keylen);
                 if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
                                              state->keylen) != 0) {
                     printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");
                 }
         } else {
-                memcpy(state->session_key, InterimKey, state->keylen);
+                memcpy(state->session_key, state->sha1_digest, state->keylen);
         }
         if (state->keylen == 8) {
                 /* See RFC 3078 */
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b85ab4a8f2a3..c921ec32c232 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1228,7 +1228,10 @@ static void rtl8169_hw_phy_config(struct net_device *dev)
                 return;
         }
 
-        /* phy config for RTL8169s mac_version C chip */
+        if ((tp->mac_version != RTL_GIGA_MAC_VER_02) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_03))
+                return;
+
         mdio_write(ioaddr, 31, 0x0001);                 //w 31 2 0 1
         mdio_write(ioaddr, 21, 0x1000);                 //w 21 15 0 1000
         mdio_write(ioaddr, 24, 0x65c7);                 //w 24 15 0 65c7
@@ -2567,6 +2570,15 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
                     (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
                         netif_wake_queue(dev);
                 }
+                /*
+                 * 8168 hack: TxPoll requests are lost when the Tx packets are
+                 * too close. Let's kick an extra TxPoll request when a burst
+                 * of start_xmit activity is detected (if it is not detected,
+                 * it is slow enough). -- FR
+                 */
+                smp_rmb();
+                if (tp->cur_tx != dirty_tx)
+                        RTL_W8(TxPoll, NPQ);
         }
 }
 
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index eaffe551d1d8..0792031a5cf9 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -338,6 +338,16 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 if (!(hw->flags & SKY2_HW_GIGABIT)) {
                         /* enable automatic crossover */
                         ctrl |= PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO) >> 1;
+
+                        if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+                            hw->chip_rev == CHIP_REV_YU_FE2_A0) {
+                                u16 spec;
+
+                                /* Enable Class A driver for FE+ A0 */
+                                spec = gm_phy_read(hw, port, PHY_MARV_FE_SPEC_2);
+                                spec |= PHY_M_FESC_SEL_CL_A;
+                                gm_phy_write(hw, port, PHY_MARV_FE_SPEC_2, spec);
+                        }
                 } else {
                         /* disable energy detect */
                         ctrl &= ~PHY_M_PC_EN_DET_MSK;
@@ -816,7 +826,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
         sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
         sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
 
-        if (!(hw->flags & SKY2_HW_RAMBUFFER)) {
+        /* On chips without ram buffer, pause is controled by MAC level */
+        if (sky2_read8(hw, B2_E_0) == 0) {
                 sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);
                 sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);
 
@@ -1271,7 +1282,7 @@ static int sky2_up(struct net_device *dev)
         struct sky2_port *sky2 = netdev_priv(dev);
         struct sky2_hw *hw = sky2->hw;
         unsigned port = sky2->port;
-        u32 imask;
+        u32 imask, ramsize;
         int cap, err = -ENOMEM;
         struct net_device *otherdev = hw->dev[sky2->port^1];
 
@@ -1326,13 +1337,12 @@ static int sky2_up(struct net_device *dev)
 
         sky2_mac_init(hw, port);
 
-        if (hw->flags & SKY2_HW_RAMBUFFER) {
-                /* Register is number of 4K blocks on internal RAM buffer. */
-                u32 ramsize = sky2_read8(hw, B2_E_0) * 4;
+        /* Register is number of 4K blocks on internal RAM buffer. */
+        ramsize = sky2_read8(hw, B2_E_0) * 4;
+        if (ramsize > 0) {
                 u32 rxspace;
 
-                printk(KERN_DEBUG PFX "%s: ram buffer %dK\n", dev->name, ramsize);
-
+                pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
                 if (ramsize < 16)
                         rxspace = ramsize / 2;
                 else
@@ -1995,7 +2005,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
 
         synchronize_irq(hw->pdev->irq);
 
-        if (!(hw->flags & SKY2_HW_RAMBUFFER))
+        if (sky2_read8(hw, B2_E_0) == 0)
                 sky2_set_tx_stfwd(hw, port);
 
         ctl = gma_read16(hw, port, GM_GP_CTRL);
@@ -2526,7 +2536,7 @@ static void sky2_watchdog(unsigned long arg)
                         ++active;
 
                         /* For chips with Rx FIFO, check if stuck */
-                        if ((hw->flags & SKY2_HW_RAMBUFFER) &&
+                        if ((hw->flags & SKY2_HW_FIFO_HANG_CHECK) &&
                              sky2_rx_hung(dev)) {
                                 pr_info(PFX "%s: receiver hang detected\n",
                                         dev->name);
@@ -2684,8 +2694,10 @@ static int __devinit sky2_init(struct sky2_hw *hw)
         switch(hw->chip_id) {
         case CHIP_ID_YUKON_XL:
                 hw->flags = SKY2_HW_GIGABIT
-                        | SKY2_HW_NEWER_PHY
-                        | SKY2_HW_RAMBUFFER;
+                        | SKY2_HW_NEWER_PHY;
+                if (hw->chip_rev < 3)
+                        hw->flags |= SKY2_HW_FIFO_HANG_CHECK;
+
                 break;
 
         case CHIP_ID_YUKON_EC_U:
@@ -2711,11 +2723,10 @@ static int __devinit sky2_init(struct sky2_hw *hw)
                         dev_err(&hw->pdev->dev, "unsupported revision Yukon-EC rev A1\n");
                         return -EOPNOTSUPP;
                 }
-                hw->flags = SKY2_HW_GIGABIT | SKY2_HW_RAMBUFFER;
+                hw->flags = SKY2_HW_GIGABIT | SKY2_HW_FIFO_HANG_CHECK;
                 break;
 
         case CHIP_ID_YUKON_FE:
-                hw->flags = SKY2_HW_RAMBUFFER;
                 break;
 
         case CHIP_ID_YUKON_FE_P:
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 69cd98400fe6..8bc5c54e3efa 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2063,7 +2063,7 @@ struct sky2_hw {
 #define SKY2_HW_FIBRE_PHY       0x00000002
 #define SKY2_HW_GIGABIT         0x00000004
 #define SKY2_HW_NEWER_PHY       0x00000008
-#define SKY2_HW_RAMBUFFER       0x00000010      /* chip has RAM FIFO */
+#define SKY2_HW_FIFO_HANG_CHECK 0x00000010
 #define SKY2_HW_NEW_LE          0x00000020      /* new LSOv2 format */
 #define SKY2_HW_AUTO_TX_SUM     0x00000040      /* new IP decode for Tx */
 #define SKY2_HW_ADV_POWER_CTL   0x00000080      /* additional PHY power regs */
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index c7c4574729b1..de3155b21285 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -289,6 +289,7 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp,
                 if (ret)
                         goto out;
         }
+        envp[i] = NULL;
 
 out:
         free_page((unsigned long)prop_buf);
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index e348ba684050..ff610c23314b 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -38,7 +38,7 @@
 #include <asm/prom.h>
 #include <asm/of_device.h>
 
-#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
 
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 8d7ab74170d5..a593f900eff4 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -431,6 +431,7 @@ static int w1_uevent(struct device *dev, char **envp, int num_envp,
         err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
                         &cur_len, "W1_SLAVE_ID=%024LX",
                         (unsigned long long)sl->reg_num.id);
+        envp[cur_index] = NULL;
         if (err)
                 return err;