diff options
| -rw-r--r-- | kernel/sched.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 9e6fb15f6f78..6da1fcef725a 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -266,7 +266,8 @@ struct rt_rq { | |||
| 266 | * acquire operations must be ordered by ascending &runqueue. | 266 | * acquire operations must be ordered by ascending &runqueue. |
| 267 | */ | 267 | */ |
| 268 | struct rq { | 268 | struct rq { |
| 269 | spinlock_t lock; /* runqueue lock */ | 269 | /* runqueue lock: */ |
| 270 | spinlock_t lock; | ||
| 270 | 271 | ||
| 271 | /* | 272 | /* |
| 272 | * nr_running and cpu_load should be in the same cacheline because | 273 | * nr_running and cpu_load should be in the same cacheline because |
| @@ -279,13 +280,15 @@ struct rq { | |||
| 279 | #ifdef CONFIG_NO_HZ | 280 | #ifdef CONFIG_NO_HZ |
| 280 | unsigned char in_nohz_recently; | 281 | unsigned char in_nohz_recently; |
| 281 | #endif | 282 | #endif |
| 282 | struct load_weight load; /* capture load from *all* tasks on this cpu */ | 283 | /* capture load from *all* tasks on this cpu: */ |
| 284 | struct load_weight load; | ||
| 283 | unsigned long nr_load_updates; | 285 | unsigned long nr_load_updates; |
| 284 | u64 nr_switches; | 286 | u64 nr_switches; |
| 285 | 287 | ||
| 286 | struct cfs_rq cfs; | 288 | struct cfs_rq cfs; |
| 287 | #ifdef CONFIG_FAIR_GROUP_SCHED | 289 | #ifdef CONFIG_FAIR_GROUP_SCHED |
| 288 | struct list_head leaf_cfs_rq_list; /* list of leaf cfs_rq on this cpu */ | 290 | /* list of leaf cfs_rq on this cpu: */ |
| 291 | struct list_head leaf_cfs_rq_list; | ||
| 289 | #endif | 292 | #endif |
| 290 | struct rt_rq rt; | 293 | struct rt_rq rt; |
| 291 | 294 | ||
| @@ -317,7 +320,8 @@ struct rq { | |||
| 317 | /* For active balancing */ | 320 | /* For active balancing */ |
| 318 | int active_balance; | 321 | int active_balance; |
| 319 | int push_cpu; | 322 | int push_cpu; |
| 320 | int cpu; /* cpu of this runqueue */ | 323 | /* cpu of this runqueue: */ |
| 324 | int cpu; | ||
| 321 | 325 | ||
| 322 | struct task_struct *migration_thread; | 326 | struct task_struct *migration_thread; |
| 323 | struct list_head migration_queue; | 327 | struct list_head migration_queue; |
