[linux-next] LinuxNextTracking branch, master, updated. next-20170614

batman at open-mesh.org batman at open-mesh.org
Thu Jun 15 00:15:37 CEST 2017

The following commit has been merged in the master branch:
commit d1aa51422013e16efb91672a32597a1d331470b2
Author: Antonio Quartulli <a at unstable.cc>
Date:   Wed Jun 7 22:51:22 2017 +0800

    batman-adv: tp_meter: mark init function with __init
    batadv_tp_meter_init() is invoked in batadv_init() only
    which is marked with __init.
    For this reason batadv_tp_meter_init() can be marked with
    __init as well and dropped after module load.
    Signed-off-by: Antonio Quartulli <a at unstable.cc>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 556f9a865ddf..e3e2585d0977 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -27,6 +27,7 @@
 #include <linux/etherdevice.h>
 #include <linux/fs.h>
 #include <linux/if_ether.h>
+#include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>
@@ -1497,7 +1498,7 @@ void batadv_tp_meter_recv(struct batadv_priv *bat_priv, struct sk_buff *skb)
  * batadv_tp_meter_init - initialize global tp_meter structures
-void batadv_tp_meter_init(void)
+void __init batadv_tp_meter_init(void)
 	get_random_bytes(batadv_tp_prerandom, sizeof(batadv_tp_prerandom));


More information about the linux-merge mailing list