diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2005-06-30 02:58:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:45:08 -0700 |
| commit | 5ee24d9594ffb070261b70461f71c42913c663bb (patch) | |
| tree | 1ce5174006693e1f9f8133e33f11fc07677b416f | |
| parent | eb05bfe4fbf031f95e392204efaa4da71c75b2e2 (diff) | |
| download | linux-3.10-5ee24d9594ffb070261b70461f71c42913c663bb.tar.gz linux-3.10-5ee24d9594ffb070261b70461f71c42913c663bb.tar.bz2 linux-3.10-5ee24d9594ffb070261b70461f71c42913c663bb.zip | |
[PATCH] s390: fix finish_arch_switch
Commit 4866cde064afbb6c2a488c265e696879de616daa requires finish_arch_switch
to have only one parameter instead of two.
Also fix another compile error (double declaration of account_system_vtime)
if CONFIG_VIRT_CPU_ACCOUNTING is not defined.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/asm-s390/system.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h index b4a9f05a93d..864cae7e1fd 100644 --- a/include/asm-s390/system.h +++ b/include/asm-s390/system.h @@ -107,11 +107,9 @@ static inline void restore_access_regs(unsigned int *acrs) #ifdef CONFIG_VIRT_CPU_ACCOUNTING extern void account_user_vtime(struct task_struct *); extern void account_system_vtime(struct task_struct *); -#else -#define account_system_vtime(prev) do { } while (0) #endif -#define finish_arch_switch(rq, prev) do { \ +#define finish_arch_switch(prev) do { \ set_fs(current->thread.mm_segment); \ account_system_vtime(prev); \ } while (0) |