Messages in this thread Patch in this message | | | Date | Wed, 29 Jun 2005 10:21:36 +0200 | From | Heiko Carstens <> | Subject | [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>
diffstat: include/asm-s390/system.h | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-)
diff -urN a/include/asm-s390/system.h b/include/asm-s390/system.h --- a/include/asm-s390/system.h 2005-06-29 09:39:40.000000000 +0200 +++ b/include/asm-s390/system.h 2005-06-29 09:40:20.000000000 +0200 @@ -107,11 +107,9 @@ #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) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |