[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>
This commit is contained in:
parent
eb05bfe4fb
commit
5ee24d9594
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user