two bug fixes for 4.10-rc3
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
Two bug fixes for 4.10-rc3
Heiko Carstens (1):
s390/kbuild: enable modversions for symbols exported from asm
Martin Schwidefsky (1):
s390/vtime: correct system time accounting
arch/s390/include/asm/asm-prototypes.h | 8 ++++++++ arch/s390/kernel/vtime.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 arch/s390/include/asm/asm-prototypes.h
arch/s390/include/asm/asm-prototypes.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef _ASM_S390_PROTOTYPES_H + +#include <linux/kvm_host.h> +#include <linux/ftrace.h> +#include <asm/fpu/api.h> +#include <asm-generic/asm-prototypes.h> + +#endif /* _ASM_S390_PROTOTYPES_H */
arch/s390/kernel/vtime.c +4 -4
@@ -94,7 +94,7 @@ static void update_mt_scaling(void)* Update process times based on virtual cpu times stored by entry.S * to the lowcore fields user_timer, system_timer & steal_clock. */ -static int do_account_vtime (struct task_struct *tsk,int hardirq_offset) +static int do_account_vtime (struct task_struct *tsk) {u64 timer, clock, user, system, steal;u64 user_scaled, system_scaled;
@@ -138,7 +138,7 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset) }account_user_time (tsk, user); tsk->utimescaled += user_scaled; -account_system_time (tsk, hardirq_offset, system); +account_system_time (tsk,0 , system); tsk->stimescaled += system_scaled; steal = S390_lowcore.steal_timer;
@@ -152,7 +152,7 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)void vtime_task_switch (struct task_struct *prev) { -do_account_vtime (prev,0 ); +do_account_vtime (prev); prev->thread.user_timer = S390_lowcore.user_timer; prev->thread.system_timer = S390_lowcore.system_timer; S390_lowcore.user_timer = current->thread.user_timer;
@@ -166,7 +166,7 @@ void vtime_task_switch(struct task_struct *prev)*/ void vtime_account_user (struct task_struct *tsk) { -if (do_account_vtime (tsk,HARDIRQ_OFFSET )) +if (do_account_vtime (tsk))virt_timer_expire (); }