diff --git a/[refs] b/[refs] index b349d32ebaa9..a9ca0293ae17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0eec481e8fb000a209fda9bf8f466aca87dc1150 +refs/heads/master: 505e371da195fad20cb8aaf45407a2849774d6d0 diff --git a/trunk/include/linux/marker.h b/trunk/include/linux/marker.h index 889196c7fbb1..4cf45472d9f5 100644 --- a/trunk/include/linux/marker.h +++ b/trunk/include/linux/marker.h @@ -136,8 +136,6 @@ extern marker_probe_func __mark_empty_function; extern void marker_probe_cb(const struct marker *mdata, void *call_private, ...); -extern void marker_probe_cb_noarg(const struct marker *mdata, - void *call_private, ...); /* * Connect a probe to a marker. diff --git a/trunk/kernel/marker.c b/trunk/kernel/marker.c index 75a1a17cd78a..23192646555f 100644 --- a/trunk/kernel/marker.c +++ b/trunk/kernel/marker.c @@ -158,7 +158,7 @@ EXPORT_SYMBOL_GPL(marker_probe_cb); * * Should be connected to markers "MARK_NOARGS". */ -void marker_probe_cb_noarg(const struct marker *mdata, void *call_private, ...) +static void marker_probe_cb_noarg(const struct marker *mdata, void *call_private, ...) { va_list args; /* not initialized */ char ptype; @@ -198,7 +198,6 @@ void marker_probe_cb_noarg(const struct marker *mdata, void *call_private, ...) } rcu_read_unlock_sched(); } -EXPORT_SYMBOL_GPL(marker_probe_cb_noarg); static void free_old_closure(struct rcu_head *head) {