diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 17:10:39 +0100 | 
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 17:10:39 +0100 | 
| commit | dd8b1cf681eab40bc5afb67bdd06b2ca341f5669 (patch) | |
| tree | 34bdaf2e7ba05c317edcfc09932daf42250cc260 | |
| parent | b67577dfb45580c498bfdb1bc76c00c3b2ad6310 (diff) | |
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>
| -rw-r--r-- | include/linux/perf_event.h | 5 | ||||
| -rw-r--r-- | lib/Kconfig.debug | 8 | 
2 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 7b18b4fd5df7..04f06b4be297 100644 --- 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 65f964e7fe78..4dc24cc13f5c 100644 --- 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"  | 
