diff options
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 8af3d249170e..8b265a8986d0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -100,7 +100,7 @@ struct robust_list_head; | |||
100 | struct bio; | 100 | struct bio; |
101 | struct fs_struct; | 101 | struct fs_struct; |
102 | struct bts_context; | 102 | struct bts_context; |
103 | struct perf_counter_context; | 103 | struct perf_event_context; |
104 | 104 | ||
105 | /* | 105 | /* |
106 | * List of flags we want to share for kernel threads, | 106 | * List of flags we want to share for kernel threads, |
@@ -701,7 +701,7 @@ struct user_struct { | |||
701 | #endif | 701 | #endif |
702 | #endif | 702 | #endif |
703 | 703 | ||
704 | #ifdef CONFIG_PERF_COUNTERS | 704 | #ifdef CONFIG_PERF_EVENTS |
705 | atomic_long_t locked_vm; | 705 | atomic_long_t locked_vm; |
706 | #endif | 706 | #endif |
707 | }; | 707 | }; |
@@ -1449,10 +1449,10 @@ struct task_struct { | |||
1449 | struct list_head pi_state_list; | 1449 | struct list_head pi_state_list; |
1450 | struct futex_pi_state *pi_state_cache; | 1450 | struct futex_pi_state *pi_state_cache; |
1451 | #endif | 1451 | #endif |
1452 | #ifdef CONFIG_PERF_COUNTERS | 1452 | #ifdef CONFIG_PERF_EVENTS |
1453 | struct perf_counter_context *perf_counter_ctxp; | 1453 | struct perf_event_context *perf_event_ctxp; |
1454 | struct mutex perf_counter_mutex; | 1454 | struct mutex perf_event_mutex; |
1455 | struct list_head perf_counter_list; | 1455 | struct list_head perf_event_list; |
1456 | #endif | 1456 | #endif |
1457 | #ifdef CONFIG_NUMA | 1457 | #ifdef CONFIG_NUMA |
1458 | struct mempolicy *mempolicy; /* Protected by alloc_lock */ | 1458 | struct mempolicy *mempolicy; /* Protected by alloc_lock */ |