diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
| commit | f6c43385435640e056424034caac0d765c45e370 (patch) | |
| tree | 54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /include/linux/sched.h | |
| parent | 65bc98b0059360e458aebd208587be44641227c1 (diff) | |
| parent | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 0085d758d645..16a982e389fb 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -498,6 +498,15 @@ struct task_cputime { | |||
| 498 | .sum_exec_runtime = 0, \ | 498 | .sum_exec_runtime = 0, \ |
| 499 | } | 499 | } |
| 500 | 500 | ||
| 501 | /* | ||
| 502 | * Disable preemption until the scheduler is running. | ||
| 503 | * Reset by start_kernel()->sched_init()->init_idle(). | ||
| 504 | * | ||
| 505 | * We include PREEMPT_ACTIVE to avoid cond_resched() from working | ||
| 506 | * before the scheduler is active -- see should_resched(). | ||
| 507 | */ | ||
| 508 | #define INIT_PREEMPT_COUNT (1 + PREEMPT_ACTIVE) | ||
| 509 | |||
| 501 | /** | 510 | /** |
| 502 | * struct thread_group_cputimer - thread group interval timer counts | 511 | * struct thread_group_cputimer - thread group interval timer counts |
| 503 | * @cputime: thread group interval timers. | 512 | * @cputime: thread group interval timers. |