43 files changed, 195 insertions, 226 deletions

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index ffcb9fd31c38..41e052fecd7f 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -1912,7 +1912,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
                                 skb->tail = skb->data + skb->len;
 #ifdef USE_CHECKSUM_HW
                                 if (vcc->vpi == 0 && vcc->vci >= ATM_NOT_RSV_VCI) {
-                                        skb->ip_summed = CHECKSUM_HW;
+                                        skb->ip_summed = CHECKSUM_COMPLETE;
                                         skb->csum = TCP_CKSUM(skb->data,
                                                         he_vcc->pdu_len);
                                 }
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index a0e5eac5f33a..b8c22255f6ad 100644
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -87,7 +87,7 @@ static int briq_panel_release(struct inode *ino, struct file *filep)
         return 0;
 }
 
-static ssize_t briq_panel_read(struct file *file, char *buf, size_t count,
+static ssize_t briq_panel_read(struct file *file, char __user *buf, size_t count,
                          loff_t *ppos)
 {
         unsigned short c;
@@ -135,7 +135,7 @@ static void scroll_vfd( void )
         vfd_cursor = 20;
 }
 
-static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
+static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_t len,
                           loff_t *ppos)
 {
         size_t indx = len;
@@ -150,19 +150,22 @@ static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
                 return -EBUSY;
 
         for (;;) {
+                char c;
                 if (!indx)
                         break;
+                if (get_user(c, buf))
+                        return -EFAULT;
                 if (esc) {
-                        set_led(*buf);
+                        set_led(c);
                         esc = 0;
-                } else if (*buf == 27) {
+                } else if (c == 27) {
                         esc = 1;
-                } else if (*buf == 12) {
+                } else if (c == 12) {
                         /* do a form feed */
                         for (i=0; i<40; i++)
                                 vfd[i] = ' ';
                         vfd_cursor = 0;
-                } else if (*buf == 10) {
+                } else if (c == 10) {
                         if (vfd_cursor < 20)
                                 vfd_cursor = 20;
                         else if (vfd_cursor < 40)
@@ -175,7 +178,7 @@ static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
                         /* just a character */
                         if (vfd_cursor > 39)
                                 scroll_vfd();
-                        vfd[vfd_cursor++] = *buf;
+                        vfd[vfd_cursor++] = c;
                 }
                 indx--;
                 buf++;
@@ -202,7 +205,7 @@ static struct miscdevice briq_panel_miscdev = {
 static int __init briq_panel_init(void)
 {
         struct device_node *root = find_path_device("/");
-        char *machine;
+        const char *machine;
         int i;
 
         machine = get_property(root, "model", NULL);
diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index 1da9adbccaec..d06b59083f6e 100644
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -38,6 +38,7 @@
 #define __IB_MAD_PRIV_H__
 
 #include <linux/completion.h>
+#include <linux/err.h>
 #include <linux/pci.h>
 #include <linux/workqueue.h>
 #include <rdma/ib_mad.h>
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 8fddc8cccdf3..dd6af551108b 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -49,6 +49,7 @@
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
 #include <linux/if_arp.h>
+#include <linux/vmalloc.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
index 1c3c9d65ecea..f49a32b7a8f6 100644
--- a/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -50,6 +50,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/mm.h>
 #include <linux/inet.h>
+#include <linux/vmalloc.h>
 
 #include <linux/route.h>