X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fs390%2Fkernel%2Ftime.c;h=3bbac1293be45d020ffbb703f74c8c8272ff70ad;hb=b297d520b9af536d5580ac505dd316be4cf5560c;hp=a963fe81359e5bc2795ee0540b4fef600121fa20;hpb=c4888f9ffafe7db107b7eafb3a68eaeeff3779c3;p=linux-2.6

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index a963fe8135..3bbac1293b 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -145,12 +145,8 @@ void account_ticks(u64 time)
 	do_timer(ticks);
 #endif
 
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-	account_tick_vtime(current);
-#else
 	while (ticks--)
 		update_process_times(user_mode(get_irq_regs()));
-#endif
 
 	s390_do_profile();
 }
@@ -1149,7 +1145,7 @@ static void etr_work_fn(struct work_struct *work)
  * Sysfs interface functions
  */
 static struct sysdev_class etr_sysclass = {
-	set_kset_name("etr")
+	.name	= "etr",
 };
 
 static struct sys_device etr_port0_dev = {