Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...

[~andy/linux] / net / rds / info.c

diff --git a/net/rds/info.c b/net/rds/info.c
index 62aeef37aefe772626644edfa1a1be318a725337..c45c4173a44d44eb9ceee633e0cec271f2182411 100644 (file)
--- a/net/rds/info.c
+++ b/net/rds/info.c
@@ -32,6 +32,7 @@
  */
 #include <linux/percpu.h>
 #include <linux/seq_file.h>
+#include <linux/slab.h>
 #include <linux/proc_fs.h>
 
 #include "rds.h"
@@ -79,6 +80,7 @@ void rds_info_register_func(int optname, rds_info_func func)
        rds_info_funcs[offset] = func;
        spin_unlock(&rds_info_lock);
 }
+EXPORT_SYMBOL_GPL(rds_info_register_func);
 
 void rds_info_deregister_func(int optname, rds_info_func func)
 {
@@ -91,6 +93,7 @@ void rds_info_deregister_func(int optname, rds_info_func func)
        rds_info_funcs[offset] = NULL;
        spin_unlock(&rds_info_lock);
 }
+EXPORT_SYMBOL_GPL(rds_info_deregister_func);
 
 /*
  * Typically we hold an atomic kmap across multiple rds_info_copy() calls
@@ -137,6 +140,7 @@ void rds_info_copy(struct rds_info_iterator *iter, void *data,
                }
        }
 }
+EXPORT_SYMBOL_GPL(rds_info_copy);
 
 /*
  * @optval points to the userspace buffer that the information snapshot