Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

[karo-tx-linux.git] / include / asm-s390 / system.h

diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index c7c3a9ad593f49682a35f3c7cb0d2a28a952cf17..b2e65e8bf812b9aa14cc92aec006caebb42340d8 100644 (file)
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -115,13 +115,14 @@ static inline void sched_cacheflush(void)
 }
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
-extern void account_user_vtime(struct task_struct *);
+extern void account_vtime(struct task_struct *);
+extern void account_tick_vtime(struct task_struct *);
 extern void account_system_vtime(struct task_struct *);
 #endif
 
 #define finish_arch_switch(prev) do {                                       \
        set_fs(current->thread.mm_segment);                                  \
-       account_system_vtime(prev);                                          \
+       account_vtime(prev);                                                 \
 } while (0)
 
 #define nop() __asm__ __volatile__ ("nop")