---

yaml --- r: 227290 b: refs/heads/master c: 8e10230 h: refs/heads/master v: v3
git-mirror · Jan 5, 2011 · 4925c45 · 4925c45
1 parent d799b65
commit 4925c45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19726cec63aeadad127f9e72ee69240336e37f15
+refs/heads/master: 8e1023016cf17152972b98bce6c144834a4916d5
diff --git a/trunk/arch/s390/kernel/processor.c b/trunk/arch/s390/kernel/processor.c
@@ -46,8 +46,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	unsigned long n = (unsigned long) v - 1;
 	int i;
 
-	s390_adjust_jiffies();
 	if (!n) {
+		s390_adjust_jiffies();
 		seq_printf(m, "vendor_id       : IBM/S390\n"
 			   "# processors    : %i\n"
 			   "bogomips per cpu: %lu.%02lu\n",

diff --git a/trunk/drivers/s390/char/sclp_config.c b/trunk/drivers/s390/char/sclp_config.c
@@ -33,6 +33,7 @@ static void sclp_cpu_capability_notify(struct work_struct *work)
 	int cpu;
 	struct sys_device *sysdev;
 
+	s390_adjust_jiffies();
 	pr_warning("cpu capability changed.\n");
 	get_online_cpus();
 	for_each_online_cpu(cpu) {