diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 02:16:23 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 02:16:23 -0500 |
| commit | 5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b (patch) | |
| tree | 2f900f89d93db6b0822d8bdf4f49851c581c12a6 /include/linux/sched.h | |
| parent | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (diff) | |
| parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9c1da0269a18..b6f51e3a38ec 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -697,12 +697,9 @@ struct task_struct { | |||
| 697 | 697 | ||
| 698 | int lock_depth; /* BKL lock depth */ | 698 | int lock_depth; /* BKL lock depth */ |
| 699 | 699 | ||
| 700 | #if defined(CONFIG_SMP) | 700 | #if defined(CONFIG_SMP) && defined(__ARCH_WANT_UNLOCKED_CTXSW) |
| 701 | int last_waker_cpu; /* CPU that last woke this task up */ | ||
| 702 | #if defined(__ARCH_WANT_UNLOCKED_CTXSW) | ||
| 703 | int oncpu; | 701 | int oncpu; |
| 704 | #endif | 702 | #endif |
| 705 | #endif | ||
| 706 | int prio, static_prio; | 703 | int prio, static_prio; |
| 707 | struct list_head run_list; | 704 | struct list_head run_list; |
| 708 | prio_array_t *array; | 705 | prio_array_t *array; |