Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e7a500 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

isdn: Convert obsolete cputime type to nsecs 



Not sure if MISDN stats are ABI but it displays task cputime in cputime_t
raw value regardless of what type cputime_t wraps which could be either
jiffies, nsecs, usecs, or whatever random time unit. Plus it wrongly
assumes that cputime_t is long.

Given that this dump is broken anyway, lets just display the nanosec
value and stick with that.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-11-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f7dcd63d

drivers/isdn/mISDN/stack.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -203,7 +203,7 @@ mISDNStackd(void *data) 
{

{

	struct mISDNstack *st = data;

	struct mISDNstack *st = data;

#ifdef MISDN_MSG_STATS

#ifdef MISDN_MSG_STATS

	cputime_t utime, stime;

	u64 utime, stime;

#endif

#endif

	int err = 0;

	int err = 0;
@@ -306,9 +306,9 @@ mISDNStackd(void *data) 
	       "msg %d sleep %d stopped\n",

	       "msg %d sleep %d stopped\n",

	       dev_name(&st->dev->dev), st->msg_cnt, st->sleep_cnt,

	       dev_name(&st->dev->dev), st->msg_cnt, st->sleep_cnt,

	       st->stopped_cnt);

	       st->stopped_cnt);

	task_cputime_t(st->thread, &utime, &stime);

	task_cputime(st->thread, &utime, &stime);

	printk(KERN_DEBUG

	printk(KERN_DEBUG

	       "mISDNStackd daemon for %s utime(%ld) stime(%ld)\n",

	       "mISDNStackd daemon for %s utime(%llu) stime(%llu)\n",

	       dev_name(&st->dev->dev), utime, stime);

	       dev_name(&st->dev->dev), utime, stime);

	printk(KERN_DEBUG

	printk(KERN_DEBUG

	       "mISDNStackd daemon for %s nvcsw(%ld) nivcsw(%ld)\n",

	       "mISDNStackd daemon for %s nvcsw(%ld) nivcsw(%ld)\n",