lkml.org 
[lkml]   [2010]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH RFC tip/core/rcu 09/30] perf_event: __rcu annotations
Date
From: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
include/linux/perf_event.h | 6 +++---
include/linux/sched.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 5d0266d..b30ee92 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -645,7 +645,7 @@ struct perf_event {
struct hlist_node hlist_entry;
int nr_siblings;
int group_flags;
- struct perf_event *group_leader;
+ struct perf_event __rcu *group_leader;
const struct pmu *pmu;

enum perf_event_active_state state;
@@ -709,7 +709,7 @@ struct perf_event {
atomic_t mmap_count;
int mmap_locked;
struct user_struct *mmap_user;
- struct perf_mmap_data *data;
+ struct perf_mmap_data __rcu *data;

/* poll related */
wait_queue_head_t waitq;
@@ -777,7 +777,7 @@ struct perf_event_context {
* These fields let us detect when two contexts have both
* been cloned (inherited) from a common ancestor.
*/
- struct perf_event_context *parent_ctx;
+ struct perf_event_context __rcu *parent_ctx;
u64 parent_gen;
u64 generation;
int pin_count;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9a2d9a0..26b85fe 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1440,7 +1440,7 @@ struct task_struct {
struct futex_pi_state *pi_state_cache;
#endif
#ifdef CONFIG_PERF_EVENTS
- struct perf_event_context *perf_event_ctxp;
+ struct perf_event_context __rcu *perf_event_ctxp;
struct mutex perf_event_mutex;
struct list_head perf_event_list;
#endif
--
1.7.0.6


\
 
 \ /
  Last update: 2010-07-14 22:15    [from the cache]
©2003-2011 Jasper Spaans