From 388cf16d90f6cce74ce531f306e2c77d6d66f2f7 Mon Sep 17 00:00:00 2001 From: Sumanth Korikkar Date: Thu, 12 Dec 2024 17:17:20 +0100 Subject: [PATCH] s390/diag: Move diag.c to diag specific folder Move implementation of s390 diagnose code to diag specific folder. Reviewed-by: Heiko Carstens Signed-off-by: Sumanth Korikkar Signed-off-by: Alexander Gordeev --- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/diag/Makefile | 2 +- arch/s390/kernel/{ => diag}/diag.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename arch/s390/kernel/{ => diag}/diag.c (99%) diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 887450df44bd4..db5f3a3faefbb 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -38,7 +38,7 @@ CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls obj-y := head64.o traps.o time.o process.o early.o setup.o idle.o vtime.o obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o -obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o +obj-y += debug.o irq.o ipl.o dis.o vdso.o cpufeature.o obj-y += sysinfo.o lgr.o os_info.o ctlreg.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o kdebugfs.o alternative.o diff --git a/arch/s390/kernel/diag/Makefile b/arch/s390/kernel/diag/Makefile index 6083c1fd2f4bb..44d3e0471151c 100644 --- a/arch/s390/kernel/diag/Makefile +++ b/arch/s390/kernel/diag/Makefile @@ -1 +1 @@ -obj-y := diag_misc.o diag324.o +obj-y := diag_misc.o diag324.o diag.o diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag/diag.c similarity index 99% rename from arch/s390/kernel/diag.c rename to arch/s390/kernel/diag/diag.c index d786b9e58a822..91161f09299fb 100644 --- a/arch/s390/kernel/diag.c +++ b/arch/s390/kernel/diag/diag.c @@ -17,7 +17,7 @@ #include #include #include -#include "entry.h" +#include "../entry.h" struct diag_stat { unsigned int counter[NR_DIAG_STAT]; -- 2.39.5