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

Move implementation of s390 diagnose code to diag specific folder.

Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 887450df44bd4cb2fd2013fd5db704a199e0b9e5..db5f3a3faefbb3637e53c6bdbbe9fca8c660499c 100644 (file)
--- 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 6083c1fd2f4bb746da5f336158f20c3f0ec0c6e0..44d3e0471151c449065adf33b77d192fd16be08f 100644 (file)
--- 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 d786b9e58a822ad1ba3b3df645f4c83103866093..91161f09299fb4676f51bbd48c1bee8e64dc55a7 100644 (file)
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag/diag.c
@@ -17,7 +17,7 @@
 #include <asm/trace/diag.h>
 #include <asm/sections.h>
 #include <asm/asm.h>
-#include "entry.h"
+#include "../entry.h"
 
 struct diag_stat {
        unsigned int counter[NR_DIAG_STAT];