From cef020a889d452d601d82fe514750497cb3865f5 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 8 Apr 2009 15:01:29 +0200 Subject: [PATCH] --- yaml --- r: 147349 b: refs/heads/master c: 8740f9418c78dcad694b46ab25d1645d5aef1f5e h: refs/heads/master i: 147347: 6e1159188fb0a35710ea74aa10a2d662e90e093f v: v3 --- [refs] | 2 +- trunk/include/linux/perf_counter.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index de63b296ed4d..4e82f06716ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 808382b33bb4c60df6379ec2db39f332cc56b82a +refs/heads/master: 8740f9418c78dcad694b46ab25d1645d5aef1f5e diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h index 4809ae18a940..8bf764fc6220 100644 --- a/trunk/include/linux/perf_counter.h +++ b/trunk/include/linux/perf_counter.h @@ -344,10 +344,12 @@ struct file; struct perf_mmap_data { struct rcu_head rcu_head; - int nr_pages; - atomic_t wakeup; - atomic_t head; - atomic_t events; + int nr_pages; /* nr of data pages */ + + atomic_t wakeup; /* POLL_ for wakeups */ + atomic_t head; /* write position */ + atomic_t events; /* event limit */ + struct perf_counter_mmap_page *user_page; void *data_pages[0]; };