diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-25 20:29:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-25 20:29:20 -0400 |
| commit | 04f58c88542b6b351efb4eea01134eb672e22e6e (patch) | |
| tree | 47bb617212f8c8951f35730e324bdc43487a01ca /kernel/trace/trace_events.c | |
| parent | 0fc31966035d7a540c011b6c967ce8eae1db121b (diff) | |
| parent | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/devicetree/bindings/net/micrel-ks8851.txt
net/core/netpoll.c
The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.
In micrel-ks8851.txt we simply have overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index f3989ceb5cd5..7b16d40bd64d 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -27,12 +27,6 @@ DEFINE_MUTEX(event_mutex); -DEFINE_MUTEX(event_storage_mutex); -EXPORT_SYMBOL_GPL(event_storage_mutex); - -char event_storage[EVENT_STORAGE_SIZE]; -EXPORT_SYMBOL_GPL(event_storage); - LIST_HEAD(ftrace_events); static LIST_HEAD(ftrace_common_fields); |