From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751562AbdBAKFk (ORCPT ); Wed, 1 Feb 2017 05:05:40 -0500 Received: from terminus.zytor.com ([65.50.211.136]:55598 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751222AbdBAKFi (ORCPT ); Wed, 1 Feb 2017 05:05:38 -0500 Date: Wed, 1 Feb 2017 02:03:48 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: torvalds@linux-foundation.org, schwidefsky@de.ibm.com, peterz@infradead.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, mpe@ellerman.id.au, fweisbec@gmail.com, riel@redhat.com, sgruszka@redhat.com, tony.luck@intel.com, heiko.carstens@de.ibm.com, mingo@kernel.org, paulus@samba.org, hpa@zytor.com, tglx@linutronix.de, wanpeng.li@hotmail.com, fenghua.yu@intel.com Reply-To: fenghua.yu@intel.com, wanpeng.li@hotmail.com, tglx@linutronix.de, paulus@samba.org, hpa@zytor.com, mingo@kernel.org, heiko.carstens@de.ibm.com, tony.luck@intel.com, sgruszka@redhat.com, riel@redhat.com, fweisbec@gmail.com, mpe@ellerman.id.au, peterz@infradead.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, torvalds@linux-foundation.org, schwidefsky@de.ibm.com In-Reply-To: <1485832191-26889-28-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-28-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/cputime: Remove jiffies based cputime Git-Commit-ID: f22d6df0b23e66b6d9058e2570402606a6ad069a 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: f22d6df0b23e66b6d9058e2570402606a6ad069a Gitweb: http://git.kernel.org/tip/f22d6df0b23e66b6d9058e2570402606a6ad069a Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:43 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:14:00 +0100 sched/cputime: Remove jiffies based cputime This cputime_t implementation is now unused, we can remove it. 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-28-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- include/asm-generic/cputime.h | 4 -- include/asm-generic/cputime_jiffies.h | 75 ----------------------------------- 2 files changed, 79 deletions(-) diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h index 5196943..8a624b4 100644 --- a/include/asm-generic/cputime.h +++ b/include/asm-generic/cputime.h @@ -4,10 +4,6 @@ #include #include -#ifndef CONFIG_VIRT_CPU_ACCOUNTING -# include -#endif - #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN # include #endif diff --git a/include/asm-generic/cputime_jiffies.h b/include/asm-generic/cputime_jiffies.h deleted file mode 100644 index 6bb8cd4..0000000 --- a/include/asm-generic/cputime_jiffies.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef _ASM_GENERIC_CPUTIME_JIFFIES_H -#define _ASM_GENERIC_CPUTIME_JIFFIES_H - -typedef unsigned long __nocast cputime_t; - -#define cmpxchg_cputime(ptr, old, new) cmpxchg(ptr, old, new) - -#define cputime_one_jiffy jiffies_to_cputime(1) -#define cputime_to_jiffies(__ct) (__force unsigned long)(__ct) -#define jiffies_to_cputime(__hz) (__force cputime_t)(__hz) - -typedef u64 __nocast cputime64_t; - -#define cputime64_to_jiffies64(__ct) (__force u64)(__ct) -#define jiffies64_to_cputime64(__jif) (__force cputime64_t)(__jif) - - -/* - * Convert nanoseconds <-> cputime - */ -#define cputime_to_nsecs(__ct) \ - jiffies_to_nsecs(cputime_to_jiffies(__ct)) -#define nsecs_to_cputime64(__nsec) \ - jiffies64_to_cputime64(nsecs_to_jiffies64(__nsec)) -#define nsecs_to_cputime(__nsec) \ - jiffies_to_cputime(nsecs_to_jiffies(__nsec)) - - -/* - * Convert cputime to microseconds and back. - */ -#define cputime_to_usecs(__ct) \ - jiffies_to_usecs(cputime_to_jiffies(__ct)) -#define usecs_to_cputime(__usec) \ - jiffies_to_cputime(usecs_to_jiffies(__usec)) -#define usecs_to_cputime64(__usec) \ - jiffies64_to_cputime64(nsecs_to_jiffies64((__usec) * 1000)) - -/* - * Convert cputime to seconds and back. - */ -#define cputime_to_secs(jif) (cputime_to_jiffies(jif) / HZ) -#define secs_to_cputime(sec) jiffies_to_cputime((sec) * HZ) - -/* - * Convert cputime to timespec and back. - */ -#define timespec_to_cputime(__val) \ - jiffies_to_cputime(timespec_to_jiffies(__val)) -#define cputime_to_timespec(__ct,__val) \ - jiffies_to_timespec(cputime_to_jiffies(__ct),__val) - -/* - * Convert cputime to timeval and back. - */ -#define timeval_to_cputime(__val) \ - jiffies_to_cputime(timeval_to_jiffies(__val)) -#define cputime_to_timeval(__ct,__val) \ - jiffies_to_timeval(cputime_to_jiffies(__ct),__val) - -/* - * Convert cputime to clock and back. - */ -#define cputime_to_clock_t(__ct) \ - jiffies_to_clock_t(cputime_to_jiffies(__ct)) -#define clock_t_to_cputime(__x) \ - jiffies_to_cputime(clock_t_to_jiffies(__x)) - -/* - * Convert cputime64 to clock. - */ -#define cputime64_to_clock_t(__ct) \ - jiffies_64_to_clock_t(cputime64_to_jiffies64(__ct)) - -#endif