tracing: Remove code which merges duplicates

We now have the logic to detect and remove duplicates in the
tracing_map hash table. The code which merges duplicates in the
histogram is redundant now. So, modify this code just to detect
duplicates. The duplication detection code is still kept to ensure
that any rare race condition which might cause duplicates does not go
unnoticed.

Link: http://lkml.kernel.org/r/55215cf59e2674391bdaf772fdafc4c393352b03.1516069914.git.tom.zanussi@linux.intel.com

Signed-off-by: Vedang Patel <vedang.patel@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

1 files changed, 0 insertions, 7 deletions

diff --git a/kernel/trace/tracing_map.h b/kernel/trace/tracing_map.h
index 5b5bbf8ae550..de57887c0670 100644
--- a/kernel/trace/tracing_map.h
+++ b/kernel/trace/tracing_map.h
@@ -215,11 +215,6 @@ struct tracing_map {
  *      Element allocation occurs before tracing begins, when the
  *      tracing_map_init() call is made by client code.
  *
- * @elt_copy: At certain points in the lifetime of an element, it may
- *      need to be copied.  The copy should include a copy of the
- *      client-allocated data, which can be copied into the 'to'
- *      element from the 'from' element.
- *
  * @elt_free: When a tracing_map_elt is freed, this function is called
  *      and allows client-allocated per-element data to be freed.
  *
@@ -233,8 +228,6 @@ struct tracing_map {
  */
 struct tracing_map_ops {
         int                     (*elt_alloc)(struct tracing_map_elt *elt);
-        void                    (*elt_copy)(struct tracing_map_elt *to,
-                                            struct tracing_map_elt *from);
         void                    (*elt_free)(struct tracing_map_elt *elt);
         void                    (*elt_clear)(struct tracing_map_elt *elt);
         void                    (*elt_init)(struct tracing_map_elt *elt);