Skip to content

Commit ec76a8c

Browse files
author
Mete Durlu
committed
s390/diag: Move diag.c to diag specific folder
JIRA: https://issues.redhat.com/browse/RHEL-72674 Conflicts: Minor merge conflict - no functional change commit 388cf16 Author: Sumanth Korikkar <sumanthk@linux.ibm.com> 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 <hca@linux.ibm.com> Signed-off-by: Sumanth Korikkar <sumanthk@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Mete Durlu <mdurlu@redhat.com>
1 parent 3c744f1 commit ec76a8c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arch/s390/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls
3838

3939
obj-y := head64.o traps.o time.o process.o early.o setup.o idle.o vtime.o
4040
obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
41-
obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o
41+
obj-y += debug.o irq.o ipl.o dis.o vdso.o cpufeature.o
4242
obj-y += sysinfo.o lgr.o os_info.o ctlreg.o
4343
obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o
4444
obj-y += entry.o reipl.o kdebugfs.o alternative.o

arch/s390/kernel/diag/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
obj-y := diag_misc.o diag324.o
1+
obj-y := diag_misc.o diag324.o diag.o

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <asm/diag.h>
1717
#include <asm/trace/diag.h>
1818
#include <asm/sections.h>
19-
#include "entry.h"
19+
#include "../entry.h"
2020

2121
struct diag_stat {
2222
unsigned int counter[NR_DIAG_STAT];

0 commit comments

Comments
 (0)