summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2022-12-20 17:07:05 +1000
committerPeter Zijlstra <peterz@infradead.org>2022-12-27 12:52:17 +0100
commitc89970202a1153b2fc230e89f90c180bd5bcbcef (patch)
tree5c979987c0eb0d8e3d71544b7788f08ac47044f8 /arch/s390
parent8589018acc65e5ddfd111f0a7ee85f9afde3a830 (diff)
downloadlinux-stable-c89970202a1153b2fc230e89f90c180bd5bcbcef.tar.gz
linux-stable-c89970202a1153b2fc230e89f90c180bd5bcbcef.tar.bz2
linux-stable-c89970202a1153b2fc230e89f90c180bd5bcbcef.zip
cputime: remove cputime_to_nsecs fallback
The archs that use cputime_to_nsecs() internally provide their own definition and don't need the fallback. cputime_to_usecs() unused except in this fallback, and is not defined anywhere. This removes the final remnant of the cputime_t code from the kernel. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Alexander Gordeev <agordeev@linux.ibm.com> Link: https://lore.kernel.org/r/20221220070705.2958959-1-npiggin@gmail.com
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/idle.c2
-rw-r--r--arch/s390/kernel/vtime.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 4bf1ee293f2b..a6bbceaf7616 100644
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -12,9 +12,9 @@
#include <linux/notifier.h>
#include <linux/init.h>
#include <linux/cpu.h>
-#include <linux/sched/cputime.h>
#include <trace/events/power.h>
#include <asm/cpu_mf.h>
+#include <asm/cputime.h>
#include <asm/nmi.h>
#include <asm/smp.h>
#include "entry.h"
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 9436f3053b88..e0a88dcaf5cb 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -7,13 +7,13 @@
*/
#include <linux/kernel_stat.h>
-#include <linux/sched/cputime.h>
#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/timex.h>
#include <linux/types.h>
#include <linux/time.h>
#include <asm/alternative.h>
+#include <asm/cputime.h>
#include <asm/vtimer.h>
#include <asm/vtime.h>
#include <asm/cpu_mf.h>