s390/diag: Move diag.c to diag specific folder

JIRA: https://issues.redhat.com/browse/RHEL-72676
Conflicts:   Minor merge conflict - no functional change

commit 388cf16
Author: Sumanth Korikkar <[email protected]>
Date:   Thu Dec 12 17:17:20 2024 +0100

    s390/diag: Move diag.c to diag specific folder

    Move implementation of s390 diagnose code to diag specific folder.

    Reviewed-by: Heiko Carstens <[email protected]>
    Signed-off-by: Sumanth Korikkar <[email protected]>
    Signed-off-by: Alexander Gordeev <[email protected]>

Signed-off-by: Mete Durlu <[email protected]>

Author: Mete Durlu

arch/s390/kernel/Makefile

@@ -36,7 +36,7 @@ CFLAGS_unwind_bc.o	+= -fno-optimize-sibling-calls
 
 obj-y	:= traps.o time.o process.o earlypgm.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

arch/s390/kernel/diag/Makefile

@@ -1 +1 @@
-obj-y	:= diag_misc.o diag324.o
+obj-y	:= diag_misc.o diag324.o diag.o

arch/s390/kernel/diag.c renamed to arch/s390/kernel/diag/diag.c

@@ -16,7 +16,7 @@
 #include <asm/diag.h>
 #include <asm/trace/diag.h>
 #include <asm/sections.h>
-#include "entry.h"
+#include "../entry.h"
 
 struct diag_stat {
 	unsigned int counter[NR_DIAG_STAT];