From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751574AbdBALBP (ORCPT ); Wed, 1 Feb 2017 06:01:15 -0500 Received: from terminus.zytor.com ([65.50.211.136]:58484 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbdBALBN (ORCPT ); Wed, 1 Feb 2017 06:01:13 -0500 Date: Wed, 1 Feb 2017 02:00:11 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: paulus@samba.org, tony.luck@intel.com, sgruszka@redhat.com, fenghua.yu@intel.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, wanpeng.li@hotmail.com, benh@kernel.crashing.org, heiko.carstens@de.ibm.com, peterz@infradead.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, riel@redhat.com, mpe@ellerman.id.au, schwidefsky@de.ibm.com Reply-To: heiko.carstens@de.ibm.com, benh@kernel.crashing.org, wanpeng.li@hotmail.com, fweisbec@gmail.com, peterz@infradead.org, riel@redhat.com, linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com, mpe@ellerman.id.au, sgruszka@redhat.com, tony.luck@intel.com, paulus@samba.org, hpa@zytor.com, fenghua.yu@intel.com, mingo@kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1485832191-26889-21-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-21-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/cputime: Remove temporary cputime_t accessors Git-Commit-ID: 71ea47b197de9a53bc3747a8b1c667df9c6a4c68 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 71ea47b197de9a53bc3747a8b1c667df9c6a4c68 Gitweb: http://git.kernel.org/tip/71ea47b197de9a53bc3747a8b1c667df9c6a4c68 Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:36 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:13:55 +0100 sched/cputime: Remove temporary cputime_t accessors Now that the whole cputime conversion to nsec units is complete, we can remove the compatibility accessors. Signed-off-by: Frederic Weisbecker Cc: Benjamin Herrenschmidt Cc: Fenghua Yu Cc: Heiko Carstens Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Michael Ellerman Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Rik van Riel Cc: Stanislaw Gruszka Cc: Thomas Gleixner Cc: Tony Luck Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1485832191-26889-21-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- include/linux/sched.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 268fdd7..d176454 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -29,7 +29,6 @@ struct sched_param { #include #include -#include #include #include @@ -613,13 +612,6 @@ struct task_cputime { unsigned long long sum_exec_runtime; }; -/* Temporary type to ease cputime_t to nsecs conversion */ -struct task_cputime_t { - cputime_t utime; - cputime_t stime; - unsigned long long sum_exec_runtime; -}; - /* Alternate field names when used to cache expirations. */ #define virt_exp utime #define prof_exp stime @@ -2291,27 +2283,6 @@ static inline void task_cputime_scaled(struct task_struct *t, } #endif -static inline void task_cputime_t(struct task_struct *t, - cputime_t *utime, cputime_t *stime) -{ - u64 ut, st; - - task_cputime(t, &ut, &st); - *utime = nsecs_to_cputime(ut); - *stime = nsecs_to_cputime(st); -} - -static inline void task_cputime_t_scaled(struct task_struct *t, - cputime_t *utimescaled, - cputime_t *stimescaled) -{ - u64 ut, st; - - task_cputime_scaled(t, &ut, &st); - *utimescaled = nsecs_to_cputime(ut); - *stimescaled = nsecs_to_cputime(st); -} - extern void task_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st); extern void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st); @@ -3527,17 +3498,6 @@ static __always_inline bool need_resched(void) void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times); void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); -static inline void thread_group_cputime_t(struct task_struct *tsk, - struct task_cputime_t *cputime) -{ - struct task_cputime times; - - thread_group_cputime(tsk, ×); - cputime->utime = nsecs_to_cputime(times.utime); - cputime->stime = nsecs_to_cputime(times.stime); - cputime->sum_exec_runtime = times.sum_exec_runtime; -} - /* * Reevaluate whether the task has signals pending delivery. * Wake the task if so.