diff options
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index fc3e8911818a..e8acce717d2a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -271,7 +271,6 @@ extern void init_idle_bootup_task(struct task_struct *idle); | |||
271 | 271 | ||
272 | extern int runqueue_is_locked(int cpu); | 272 | extern int runqueue_is_locked(int cpu); |
273 | 273 | ||
274 | extern cpumask_var_t nohz_cpu_mask; | ||
275 | #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) | 274 | #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) |
276 | extern void select_nohz_load_balancer(int stop_tick); | 275 | extern void select_nohz_load_balancer(int stop_tick); |
277 | extern int get_nohz_timer_target(void); | 276 | extern int get_nohz_timer_target(void); |
@@ -511,7 +510,7 @@ struct task_cputime { | |||
511 | struct thread_group_cputimer { | 510 | struct thread_group_cputimer { |
512 | struct task_cputime cputime; | 511 | struct task_cputime cputime; |
513 | int running; | 512 | int running; |
514 | spinlock_t lock; | 513 | raw_spinlock_t lock; |
515 | }; | 514 | }; |
516 | 515 | ||
517 | #include <linux/rwsem.h> | 516 | #include <linux/rwsem.h> |
@@ -1261,9 +1260,6 @@ struct task_struct { | |||
1261 | #ifdef CONFIG_PREEMPT_RCU | 1260 | #ifdef CONFIG_PREEMPT_RCU |
1262 | int rcu_read_lock_nesting; | 1261 | int rcu_read_lock_nesting; |
1263 | char rcu_read_unlock_special; | 1262 | char rcu_read_unlock_special; |
1264 | #if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU) | ||
1265 | int rcu_boosted; | ||
1266 | #endif /* #if defined(CONFIG_RCU_BOOST) && defined(CONFIG_TREE_PREEMPT_RCU) */ | ||
1267 | struct list_head rcu_node_entry; | 1263 | struct list_head rcu_node_entry; |
1268 | #endif /* #ifdef CONFIG_PREEMPT_RCU */ | 1264 | #endif /* #ifdef CONFIG_PREEMPT_RCU */ |
1269 | #ifdef CONFIG_TREE_PREEMPT_RCU | 1265 | #ifdef CONFIG_TREE_PREEMPT_RCU |
@@ -2170,7 +2166,8 @@ extern int force_sigsegv(int, struct task_struct *); | |||
2170 | extern int force_sig_info(int, struct siginfo *, struct task_struct *); | 2166 | extern int force_sig_info(int, struct siginfo *, struct task_struct *); |
2171 | extern int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp); | 2167 | extern int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp); |
2172 | extern int kill_pid_info(int sig, struct siginfo *info, struct pid *pid); | 2168 | extern int kill_pid_info(int sig, struct siginfo *info, struct pid *pid); |
2173 | extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_t, u32); | 2169 | extern int kill_pid_info_as_cred(int, struct siginfo *, struct pid *, |
2170 | const struct cred *, u32); | ||
2174 | extern int kill_pgrp(struct pid *pid, int sig, int priv); | 2171 | extern int kill_pgrp(struct pid *pid, int sig, int priv); |
2175 | extern int kill_pid(struct pid *pid, int sig, int priv); | 2172 | extern int kill_pid(struct pid *pid, int sig, int priv); |
2176 | extern int kill_proc_info(int, struct siginfo *, pid_t); | 2173 | extern int kill_proc_info(int, struct siginfo *, pid_t); |
@@ -2570,7 +2567,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); | |||
2570 | 2567 | ||
2571 | static inline void thread_group_cputime_init(struct signal_struct *sig) | 2568 | static inline void thread_group_cputime_init(struct signal_struct *sig) |
2572 | { | 2569 | { |
2573 | spin_lock_init(&sig->cputimer.lock); | 2570 | raw_spin_lock_init(&sig->cputimer.lock); |
2574 | } | 2571 | } |
2575 | 2572 | ||
2576 | /* | 2573 | /* |