summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/cputime.h
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2017-01-31 04:09:44 +0100
committerIngo Molnar <mingo@kernel.org>2017-02-01 09:14:01 +0100
commit4c562529f1ded4801f572e6dfcb464e598ef8f15 (patch)
treead37eccf21136ecb5f035788d881820b2755e45a /include/asm-generic/cputime.h
parentsched/cputime: Remove jiffies based cputime (diff)
downloadlinux-4c562529f1ded4801f572e6dfcb464e598ef8f15.tar.xz
linux-4c562529f1ded4801f572e6dfcb464e598ef8f15.zip
ia64, sched/cputime: Move the nsecs based cputime headers to the last arch using it
Initially, nsec based cputime_t implementation belonged to IA64. It got exported later for CONFIG_VIRT_CPU_ACCOUNTING_GEN but now it is again only used by IA64. So let's move it back there. Signed-off-by: Frederic 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-29-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic/cputime.h')
-rw-r--r--include/asm-generic/cputime.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h
index 8a624b454ba3..358e54777b56 100644
--- a/include/asm-generic/cputime.h
+++ b/include/asm-generic/cputime.h
@@ -4,8 +4,4 @@
#include <linux/time.h>
#include <linux/jiffies.h>
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
-# include <asm-generic/cputime_nsecs.h>
-#endif
-
#endif