diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /include/linux/sched.h | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
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; |