Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sched/cputime: Remove generic asm headers

cputime_t is now only used by two architectures:

* powerpc (when CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y)
* s390

And since the core doesn't use it anymore, we don't need any arch support
from the others. So we can remove their stub implementations.

A final cleanup would be to provide an efficient pure arch
implementation of cputime_to_nsec() for s390 and powerpc and finally
remove include/linux/cputime.h .

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-36-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Frederic Weisbecker and committed by
Ingo Molnar
b672592f 934ad473

+4 -41
-1
arch/alpha/include/asm/Kbuild
··· 1 1 2 2 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += exec.h 6 5 generic-y += export.h 7 6 generic-y += irq_work.h
-1
arch/arc/include/asm/Kbuild
··· 2 2 generic-y += bitsperlong.h 3 3 generic-y += bugs.h 4 4 generic-y += clkdev.h 5 - generic-y += cputime.h 6 5 generic-y += device.h 7 6 generic-y += div64.h 8 7 generic-y += emergency-restart.h
-1
arch/arm/include/asm/Kbuild
··· 2 2 3 3 generic-y += bitsperlong.h 4 4 generic-y += clkdev.h 5 - generic-y += cputime.h 6 5 generic-y += current.h 7 6 generic-y += early_ioremap.h 8 7 generic-y += emergency-restart.h
-1
arch/arm64/include/asm/Kbuild
··· 1 1 generic-y += bugs.h 2 2 generic-y += clkdev.h 3 - generic-y += cputime.h 4 3 generic-y += delay.h 5 4 generic-y += div64.h 6 5 generic-y += dma.h
-1
arch/avr32/include/asm/Kbuild
··· 1 1 2 2 generic-y += clkdev.h 3 - generic-y += cputime.h 4 3 generic-y += delay.h 5 4 generic-y += device.h 6 5 generic-y += div64.h
-1
arch/blackfin/include/asm/Kbuild
··· 2 2 generic-y += auxvec.h 3 3 generic-y += bitsperlong.h 4 4 generic-y += bugs.h 5 - generic-y += cputime.h 6 5 generic-y += current.h 7 6 generic-y += device.h 8 7 generic-y += div64.h
-1
arch/c6x/include/asm/Kbuild
··· 5 5 generic-y += bitsperlong.h 6 6 generic-y += bugs.h 7 7 generic-y += clkdev.h 8 - generic-y += cputime.h 9 8 generic-y += current.h 10 9 generic-y += device.h 11 10 generic-y += div64.h
-1
arch/cris/include/asm/Kbuild
··· 4 4 generic-y += bitsperlong.h 5 5 generic-y += clkdev.h 6 6 generic-y += cmpxchg.h 7 - generic-y += cputime.h 8 7 generic-y += device.h 9 8 generic-y += div64.h 10 9 generic-y += errno.h
-1
arch/frv/include/asm/Kbuild
··· 1 1 2 2 generic-y += clkdev.h 3 - generic-y += cputime.h 4 3 generic-y += exec.h 5 4 generic-y += irq_work.h 6 5 generic-y += mcs_spinlock.h
-1
arch/h8300/include/asm/Kbuild
··· 5 5 generic-y += cacheflush.h 6 6 generic-y += checksum.h 7 7 generic-y += clkdev.h 8 - generic-y += cputime.h 9 8 generic-y += current.h 10 9 generic-y += delay.h 11 10 generic-y += device.h
-1
arch/hexagon/include/asm/Kbuild
··· 6 6 generic-y += bug.h 7 7 generic-y += bugs.h 8 8 generic-y += clkdev.h 9 - generic-y += cputime.h 10 9 generic-y += current.h 11 10 generic-y += device.h 12 11 generic-y += div64.h
+1 -3
arch/ia64/include/asm/cputime.h
··· 18 18 #ifndef __IA64_CPUTIME_H 19 19 #define __IA64_CPUTIME_H 20 20 21 - #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE 22 - # include <asm-generic/cputime.h> 23 - #else 21 + #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE 24 22 extern void arch_vtime_task_switch(struct task_struct *tsk); 25 23 #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ 26 24
-1
arch/m32r/include/asm/Kbuild
··· 1 1 2 2 generic-y += clkdev.h 3 - generic-y += cputime.h 4 3 generic-y += exec.h 5 4 generic-y += irq_work.h 6 5 generic-y += kvm_para.h
-1
arch/m68k/include/asm/Kbuild
··· 1 1 generic-y += barrier.h 2 2 generic-y += bitsperlong.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += device.h 6 5 generic-y += emergency-restart.h 7 6 generic-y += errno.h
-1
arch/metag/include/asm/Kbuild
··· 2 2 generic-y += bitsperlong.h 3 3 generic-y += bugs.h 4 4 generic-y += clkdev.h 5 - generic-y += cputime.h 6 5 generic-y += current.h 7 6 generic-y += device.h 8 7 generic-y += dma.h
-1
arch/microblaze/include/asm/Kbuild
··· 1 1 2 2 generic-y += barrier.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += device.h 6 5 generic-y += exec.h 7 6 generic-y += irq_work.h
-1
arch/mips/include/asm/Kbuild
··· 1 1 # MIPS headers 2 2 generic-(CONFIG_GENERIC_CSUM) += checksum.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += current.h 6 5 generic-y += dma-contiguous.h 7 6 generic-y += emergency-restart.h
-1
arch/mn10300/include/asm/Kbuild
··· 1 1 2 2 generic-y += barrier.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += exec.h 6 5 generic-y += irq_work.h 7 6 generic-y += mcs_spinlock.h
-1
arch/nios2/include/asm/Kbuild
··· 6 6 generic-y += bug.h 7 7 generic-y += bugs.h 8 8 generic-y += clkdev.h 9 - generic-y += cputime.h 10 9 generic-y += current.h 11 10 generic-y += device.h 12 11 generic-y += div64.h
-1
arch/openrisc/include/asm/Kbuild
··· 12 12 generic-y += clkdev.h 13 13 generic-y += cmpxchg-local.h 14 14 generic-y += cmpxchg.h 15 - generic-y += cputime.h 16 15 generic-y += current.h 17 16 generic-y += device.h 18 17 generic-y += div64.h
-1
arch/parisc/include/asm/Kbuild
··· 2 2 generic-y += auxvec.h 3 3 generic-y += barrier.h 4 4 generic-y += clkdev.h 5 - generic-y += cputime.h 6 5 generic-y += device.h 7 6 generic-y += div64.h 8 7 generic-y += emergency-restart.h
+1 -3
arch/powerpc/include/asm/cputime.h
··· 16 16 #ifndef __POWERPC_CPUTIME_H 17 17 #define __POWERPC_CPUTIME_H 18 18 19 - #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE 20 - #include <asm-generic/cputime.h> 21 - #else 19 + #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE 22 20 23 21 #include <linux/types.h> 24 22 #include <linux/time.h>
-1
arch/score/include/asm/Kbuild
··· 4 4 5 5 generic-y += barrier.h 6 6 generic-y += clkdev.h 7 - generic-y += cputime.h 8 7 generic-y += irq_work.h 9 8 generic-y += mcs_spinlock.h 10 9 generic-y += mm-arch-hooks.h
-1
arch/sh/include/asm/Kbuild
··· 1 1 2 2 generic-y += bitsperlong.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += current.h 6 5 generic-y += delay.h 7 6 generic-y += div64.h
-1
arch/sparc/include/asm/Kbuild
··· 2 2 3 3 4 4 generic-y += clkdev.h 5 - generic-y += cputime.h 6 5 generic-y += div64.h 7 6 generic-y += emergency-restart.h 8 7 generic-y += exec.h
-1
arch/tile/include/asm/Kbuild
··· 4 4 generic-y += bug.h 5 5 generic-y += bugs.h 6 6 generic-y += clkdev.h 7 - generic-y += cputime.h 8 7 generic-y += div64.h 9 8 generic-y += emergency-restart.h 10 9 generic-y += errno.h
-1
arch/um/include/asm/Kbuild
··· 1 1 generic-y += barrier.h 2 2 generic-y += bug.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += current.h 6 5 generic-y += delay.h 7 6 generic-y += device.h
-1
arch/unicore32/include/asm/Kbuild
··· 4 4 generic-y += bitsperlong.h 5 5 generic-y += bugs.h 6 6 generic-y += clkdev.h 7 - generic-y += cputime.h 8 7 generic-y += current.h 9 8 generic-y += device.h 10 9 generic-y += div64.h
-1
arch/x86/include/asm/Kbuild
··· 7 7 generated-y += xen-hypercalls.h 8 8 9 9 generic-y += clkdev.h 10 - generic-y += cputime.h 11 10 generic-y += dma-contiguous.h 12 11 generic-y += early_ioremap.h 13 12 generic-y += mcs_spinlock.h
-1
arch/xtensa/include/asm/Kbuild
··· 1 1 generic-y += bitsperlong.h 2 2 generic-y += bug.h 3 3 generic-y += clkdev.h 4 - generic-y += cputime.h 5 4 generic-y += div64.h 6 5 generic-y += dma-contiguous.h 7 6 generic-y += emergency-restart.h
-7
include/asm-generic/cputime.h
··· 1 - #ifndef _ASM_GENERIC_CPUTIME_H 2 - #define _ASM_GENERIC_CPUTIME_H 3 - 4 - #include <linux/time.h> 5 - #include <linux/jiffies.h> 6 - 7 - #endif
+2
include/linux/cputime.h
··· 1 1 #ifndef __LINUX_CPUTIME_H 2 2 #define __LINUX_CPUTIME_H 3 3 4 + #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE 4 5 #include <asm/cputime.h> 5 6 6 7 #ifndef cputime_to_nsecs ··· 9 8 (cputime_to_usecs(__ct) * NSEC_PER_USEC) 10 9 #endif 11 10 11 + #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ 12 12 #endif /* __LINUX_CPUTIME_H */