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

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

fs/binfmt: Convert obsolete cputime type to nsecs 



Use the new nsec based cputime accessors as part of the whole cputime
conversion from cputime_t to nsecs.

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-12-git-send-email-fweisbec@gmail.com


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

arch/mips/kernel/binfmt_elfn32.c

+2 −10
Original line number Diff line number Diff line
@@ -99,15 +99,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) 
#undef TASK_SIZE

#define TASK_SIZE TASK_SIZE32



#undef cputime_to_timeval

#define cputime_to_timeval cputime_to_compat_timeval

static __inline__ void

cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)

{

	unsigned long jiffies = cputime_to_jiffies(cputime);



	value->tv_usec = (jiffies % HZ) * (1000000L / HZ);

	value->tv_sec = jiffies / HZ;

}

#undef ns_to_timeval

#define ns_to_timeval ns_to_compat_timeval



#include "../../../fs/binfmt_elf.c"

arch/mips/kernel/binfmt_elfo32.c

+2 −10
Original line number Diff line number Diff line
@@ -102,15 +102,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) 
#undef TASK_SIZE

#define TASK_SIZE TASK_SIZE32



#undef cputime_to_timeval

#define cputime_to_timeval cputime_to_compat_timeval

static __inline__ void

cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)

{

	unsigned long jiffies = cputime_to_jiffies(cputime);



	value->tv_usec = (jiffies % HZ) * (1000000L / HZ);

	value->tv_sec = jiffies / HZ;

}

#undef ns_to_timeval

#define ns_to_timeval ns_to_compat_timeval



#include "../../../fs/binfmt_elf.c"

arch/parisc/kernel/binfmt_elf32.c

+2 −9
Original line number Diff line number Diff line
@@ -91,14 +91,7 @@ struct elf_prpsinfo32 
	current->thread.map_base = DEFAULT_MAP_BASE32; \

	current->thread.task_size = DEFAULT_TASK_SIZE32 \



#undef cputime_to_timeval

#define cputime_to_timeval cputime_to_compat_timeval

static __inline__ void

cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)

{

	unsigned long jiffies = cputime_to_jiffies(cputime);

	value->tv_usec = (jiffies % HZ) * (1000000L / HZ);

	value->tv_sec = jiffies / HZ;

}

#undef ns_to_timeval

#define ns_to_timeval ns_to_compat_timeval



#include "../../../fs/binfmt_elf.c"

fs/binfmt_elf.c

+10 −16
Original line number Diff line number Diff line
@@ -1411,8 +1411,6 @@ static void fill_note(struct memelfnote *note, const char *name, int type, 
static void fill_prstatus(struct elf_prstatus *prstatus,

		struct task_struct *p, long signr)

{

	struct timeval tv;



	prstatus->pr_info.si_signo = prstatus->pr_cursig = signr;

	prstatus->pr_sigpend = p->pending.signal.sig[0];

	prstatus->pr_sighold = p->blocked.sig[0];
@@ -1423,29 +1421,25 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
	prstatus->pr_pgrp = task_pgrp_vnr(p);

	prstatus->pr_sid = task_session_vnr(p);

	if (thread_group_leader(p)) {

		struct task_cputime_t cputime;

		struct task_cputime cputime;



		/*

		 * This is the record for the group leader.  It shows the

		 * group-wide total, not its individual thread total.

		 */

		thread_group_cputime_t(p, &cputime);

		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

		thread_group_cputime(p, &cputime);

		prstatus->pr_utime = ns_to_timeval(cputime.utime);

		prstatus->pr_stime = ns_to_timeval(cputime.stime);

	} else {

		cputime_t utime, stime;

		u64 utime, stime;



		task_cputime_t(p, &utime, &stime);

		cputime_to_timeval(utime, &prstatus->pr_utime);

		cputime_to_timeval(stime, &prstatus->pr_stime);

		task_cputime(p, &utime, &stime);

		prstatus->pr_utime = ns_to_timeval(utime);

		prstatus->pr_stime = ns_to_timeval(stime);

	}

	tv = ns_to_timeval(p->signal->cutime);

	prstatus->pr_cutime.tv_sec = tv.tv_sec;

	prstatus->pr_cutime.tv_usec = tv.tv_usec;



	tv = ns_to_timeval(p->signal->cstime);

	prstatus->pr_cstime.tv_sec = tv.tv_sec;

	prstatus->pr_cstime.tv_usec = tv.tv_usec;

	prstatus->pr_cutime = ns_to_timeval(p->signal->cutime);

	prstatus->pr_cstime = ns_to_timeval(p->signal->cstime);

}



static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,

fs/binfmt_elf_fdpic.c

+8 −8
Original line number Diff line number Diff line
@@ -1342,21 +1342,21 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
	prstatus->pr_pgrp = task_pgrp_vnr(p);

	prstatus->pr_sid = task_session_vnr(p);

	if (thread_group_leader(p)) {

		struct task_cputime_t cputime;

		struct task_cputime cputime;



		/*

		 * This is the record for the group leader.  It shows the

		 * group-wide total, not its individual thread total.

		 */

		thread_group_cputime_t(p, &cputime);

		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

		thread_group_cputime(p, &cputime);

		prstatus->pr_utime = ns_to_timeval(cputime.utime);

		prstatus->pr_stime = ns_to_timeval(cputime.stime);

	} else {

		cputime_t utime, stime;

		u64 utime, stime;



		task_cputime_t(p, &utime, &stime);

		cputime_to_timeval(utime, &prstatus->pr_utime);

		cputime_to_timeval(stime, &prstatus->pr_stime);

		task_cputime(p, &utime, &stime);

		prstatus->pr_utime = ns_to_timeval(utime);

		prstatus->pr_stime = ns_to_timeval(stime);

	}

	prstatus->pr_cutime = ns_to_timeval(p->signal->cutime);

	prstatus->pr_cstime = ns_to_timeval(p->signal->cstime);