diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-04 09:12:50 +0200 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-04 09:12:50 +0200 | 
| commit | f68d891d85c8f9ab1af663ed3ceac18ad58dbabe (patch) | |
| tree | d92db7af512307ab5282eb62f3dd1741ac71d21f /include/linux/perf_event.h | |
| parent | 5780b627e24113323427c102175296ae43dfb9d7 (diff) | |
| parent | 3fd877d32cac31292628fb8f443543fc1989b49b (diff) | |
Merge branch 'topic/hda-beep' into topic/hda
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f32578634d9d..45db49f64bb4 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -555,6 +555,8 @@ enum perf_event_type {  	PERF_RECORD_MAX,			/* non-ABI */  }; +#define PERF_MAX_STACK_DEPTH		127 +  enum perf_callchain_context {  	PERF_CONTEXT_HV			= (__u64)-32,  	PERF_CONTEXT_KERNEL		= (__u64)-128, @@ -609,8 +611,6 @@ struct perf_guest_info_callbacks {  #include <linux/sysfs.h>  #include <asm/local.h> -#define PERF_MAX_STACK_DEPTH		255 -  struct perf_callchain_entry {  	__u64				nr;  	__u64				ip[PERF_MAX_STACK_DEPTH];  | 
