forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'v2.6.33' into perf/core

Browse source 
Merge reason:
	__percpu annotations need the corresponding sparse address
space definition upstream.

Conflicts:
	tools/perf/util/probe-event.c (trivial)
This commit is contained in:
Frederic Weisbecker 2010-02-27 16:18:46 +01:00
commit 018cbffe68
696 changed files with 10855 additions and 6150 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/linux/perf_event.h
View file

@ -211,11 +211,9 @@ struct perf_event_attr {
__u32 wakeup_watermark; /* bytes before wakeup */
};
__u32 __reserved_2;
__u64 bp_addr;
__u32 bp_type;
__u32 bp_len;
__u64 bp_addr;
__u64 bp_len;
};
/*