9 files changed, 77 insertions, 45 deletions

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/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/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/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/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/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 6f56f8750635..4df21c92ff1e 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -787,10 +787,12 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
         struct scsi_target *starget = sdev->sdev_target;
         struct Scsi_Host *shost = sdev->host;
         int len = sdev->inquiry_len;
+        int min_period = spi_min_period(starget);
+        int max_width = spi_max_width(starget);
         /* first set us up for narrow async */
         DV_SET(offset, 0);
         DV_SET(width, 0);
-        
+
         if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS)
             != SPI_COMPARE_SUCCESS) {
                 starget_printk(KERN_ERR, starget, "Domain Validation Initial Inquiry Failed\n");
@@ -798,9 +800,13 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                 return;
         }
 
+        if (!scsi_device_wide(sdev)) {
+                spi_max_width(starget) = 0;
+                max_width = 0;
+        }
+
         /* test width */
-        if (i->f->set_width && spi_max_width(starget) &&
-            scsi_device_wide(sdev)) {
+        if (i->f->set_width && max_width) {
                 i->f->set_width(starget, 1);
 
                 if (spi_dv_device_compare_inquiry(sdev, buffer,
@@ -809,6 +815,11 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                     != SPI_COMPARE_SUCCESS) {
                         starget_printk(KERN_ERR, starget, "Wide Transfers Fail\n");
                         i->f->set_width(starget, 0);
+                        /* Make sure we don't force wide back on by asking
+                         * for a transfer period that requires it */
+                        max_width = 0;
+                        if (min_period < 10)
+                                min_period = 10;
                 }
         }
 
@@ -828,7 +839,8 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
 
         /* now set up to the maximum */
         DV_SET(offset, spi_max_offset(starget));
-        DV_SET(period, spi_min_period(starget));
+        DV_SET(period, min_period);
+
         /* try QAS requests; this should be harmless to set if the
          * target supports it */
         if (scsi_device_qas(sdev)) {
@@ -837,14 +849,14 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                 DV_SET(qas, 0);
         }
 
-        if (scsi_device_ius(sdev) && spi_min_period(starget) < 9) {
+        if (scsi_device_ius(sdev) && min_period < 9) {
                 /* This u320 (or u640). Set IU transfers */
                 DV_SET(iu, 1);
                 /* Then set the optional parameters */
                 DV_SET(rd_strm, 1);
                 DV_SET(wr_flow, 1);
                 DV_SET(rti, 1);
-                if (spi_min_period(starget) == 8)
+                if (min_period == 8)
                         DV_SET(pcomp_en, 1);
         } else {
                 DV_SET(iu, 0);
@@ -862,6 +874,10 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
         } else {
                 DV_SET(dt, 1);
         }
+        /* set width last because it will pull all the other
+         * parameters down to required values */
+        DV_SET(width, max_width);
+
         /* Do the read only INQUIRY tests */
         spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len,
                        spi_dv_device_compare_inquiry);
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;