diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-13 02:13:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-13 02:13:38 -0700 |
| commit | 3b05e668d5809cf952fd522b94c48685e7dada01 (patch) | |
| tree | fe690fda77e54c413cafc98866227713467be1c7 /include | |
| parent | bff618678599846f60bf0c17510a128680b28c60 (diff) | |
| parent | d58a247cf1d00cd740bc39dc64a5cdb1e80dc933 (diff) | |
Merge master.kernel.org:/home/mingo/BK/linux-2.5-sched/
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/system.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h index 2b05d93da4eb..851f090e4394 100644 --- a/include/asm-i386/system.h +++ b/include/asm-i386/system.h @@ -11,9 +11,12 @@ struct task_struct; /* one of the stranger aspects of C forward declarations.. */ extern void FASTCALL(__switch_to(struct task_struct *prev, struct task_struct *next)); -#define prepare_to_switch() do { } while(0) +#define prepare_arch_schedule(prev) do { } while(0) +#define finish_arch_schedule(prev) do { } while(0) +#define prepare_arch_switch(rq) do { } while(0) +#define finish_arch_switch(rq) spin_unlock_irq(&(rq)->lock) -#define switch_to(prev,next) do { \ +#define switch_to(prev,next,last) do { \ asm volatile("pushl %%esi\n\t" \ "pushl %%edi\n\t" \ "pushl %%ebp\n\t" \ |