diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
| commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
| tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /include/asm-m32r/system.h | |
| parent | c2a6585296009379e0f4eff39cdcb108b457ebf2 (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'include/asm-m32r/system.h')
| -rw-r--r-- | include/asm-m32r/system.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h index d6a2c613be68..c5ab5da56d21 100644 --- a/include/asm-m32r/system.h +++ b/include/asm-m32r/system.h | |||
| @@ -22,10 +22,6 @@ | |||
| 22 | * `next' and `prev' should be struct task_struct, but it isn't always defined | 22 | * `next' and `prev' should be struct task_struct, but it isn't always defined |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #ifndef CONFIG_SMP | ||
| 26 | #define prepare_to_switch() do { } while(0) | ||
| 27 | #endif /* not CONFIG_SMP */ | ||
| 28 | |||
| 29 | #define switch_to(prev, next, last) do { \ | 25 | #define switch_to(prev, next, last) do { \ |
| 30 | register unsigned long arg0 __asm__ ("r0") = (unsigned long)prev; \ | 26 | register unsigned long arg0 __asm__ ("r0") = (unsigned long)prev; \ |
| 31 | register unsigned long arg1 __asm__ ("r1") = (unsigned long)next; \ | 27 | register unsigned long arg1 __asm__ ("r1") = (unsigned long)next; \ |