perf: Remove pointless breakpoint union

Remove pointless union in the breakpoint field of hw_perf_event.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 7b18b4fd5df7b80686e8db84e2b912a9e1a05ae1..04f06b4be297da03db700934049a4936cf6b6683 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -487,9 +487,8 @@ struct hw_perf_event {
                        struct hrtimer  hrtimer;
                };
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
-               union { /* breakpoint */
-                       struct arch_hw_breakpoint       info;
-               };
+               /* breakpoint */
+               struct arch_hw_breakpoint       info;
 #endif
        };
        atomic64_t                      prev_count;

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 65f964e7fe7857a5865410a9c3b7a087b3541804..4dc24cc13f5c3a6dab455714c4943d7514d94275 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -520,11 +520,13 @@ config LOCK_STAT
 
         For more details, see Documentation/lockstat.txt
 
-        You can analyze lock events with "perf lock", subcommand of perf.
-        If you want to use "perf lock", you need to turn on CONFIG_EVENT_TRACING.
+        This also enables lock events required by "perf lock",
+        subcommand of perf.
+        If you want to use "perf lock", you also need to turn on
+        CONFIG_EVENT_TRACING.
 
         CONFIG_LOCK_STAT defines "contended" and "acquired" lock events.
-        (CONFIG_LOCKDEP defines "acquire" and "release" events.)
+        (CONFIG_LOCKDEP defines "acquire" and "release" events.)
 
 config DEBUG_LOCKDEP
        bool "Lock dependency engine debugging"