4 files changed, 7 insertions, 9 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index b7ba81afc6f..edcf019c056 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6450,7 +6450,7 @@ const char *netdev_drivername(const struct net_device *dev)
         return empty;
 }
 
-static int __netdev_printk(const char *level, const struct net_device *dev,
+int __netdev_printk(const char *level, const struct net_device *dev,
                            struct va_format *vaf)
 {
         int r;
@@ -6465,6 +6465,7 @@ static int __netdev_printk(const char *level, const struct net_device *dev,
 
         return r;
 }
+EXPORT_SYMBOL(__netdev_printk);
 
 int netdev_printk(const char *level, const struct net_device *dev,
                   const char *format, ...)
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 32bff6d86cb..8260b13d93c 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -505,7 +505,7 @@ config NETFILTER_XT_TARGET_LED
             echo netfilter-ssh > /sys/class/leds/<ledname>/trigger
 
           For more information on the LEDs available on your system, see
-          Documentation/leds-class.txt
+          Documentation/leds/leds-class.txt
 
 config NETFILTER_XT_TARGET_MARK
         tristate '"MARK" target support'
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index b0869fe3633..71441b934ff 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i)
 
         size = sizeof(void **) * nr_cpu_ids;
         if (size > PAGE_SIZE)
-                i->jumpstack = vmalloc(size);
+                i->jumpstack = vzalloc(size);
         else
-                i->jumpstack = kmalloc(size, GFP_KERNEL);
+                i->jumpstack = kzalloc(size, GFP_KERNEL);
         if (i->jumpstack == NULL)
                 return -ENOMEM;
-        memset(i->jumpstack, 0, size);
 
         i->stacksize *= xt_jumpstack_multiplier;
         size = sizeof(void *) * i->stacksize;
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index cd67026be2d..51c868923f6 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -375,23 +375,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
                 goto out;
         }
 
-        ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work),
+        ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work),
                                    ibdev_to_node(dev));
         if (!ic->i_sends) {
                 ret = -ENOMEM;
                 rdsdebug("send allocation failed\n");
                 goto out;
         }
-        memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work));
 
-        ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work),
+        ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work),
                                    ibdev_to_node(dev));
         if (!ic->i_recvs) {
                 ret = -ENOMEM;
                 rdsdebug("recv allocation failed\n");
                 goto out;
         }
-        memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work));
 
         rds_ib_recv_init_ack(ic);