diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /include/asm-arm26/system.h | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge branch 'origin'
Diffstat (limited to 'include/asm-arm26/system.h')
| -rw-r--r-- | include/asm-arm26/system.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-arm26/system.h b/include/asm-arm26/system.h index ca4ccfc4b578..702884926a55 100644 --- a/include/asm-arm26/system.h +++ b/include/asm-arm26/system.h | |||
| @@ -98,9 +98,8 @@ extern unsigned int user_debug; | |||
| 98 | * spin_unlock_irq() and friends are implemented. This avoids | 98 | * spin_unlock_irq() and friends are implemented. This avoids |
| 99 | * us needlessly decrementing and incrementing the preempt count. | 99 | * us needlessly decrementing and incrementing the preempt count. |
| 100 | */ | 100 | */ |
| 101 | #define prepare_arch_switch(rq,next) local_irq_enable() | 101 | #define prepare_arch_switch(next) local_irq_enable() |
| 102 | #define finish_arch_switch(rq,prev) spin_unlock(&(rq)->lock) | 102 | #define finish_arch_switch(prev) spin_unlock(&(rq)->lock) |
| 103 | #define task_running(rq,p) ((rq)->curr == (p)) | ||
| 104 | 103 | ||
| 105 | /* | 104 | /* |
| 106 | * switch_to(prev, next) should switch from task `prev' to `next' | 105 | * switch_to(prev, next) should switch from task `prev' to `next' |