From: Heiko Carstens <hca@linux.ibm.com>
Date: Tue, 25 Feb 2025 08:47:34 +0000 (+0100)
Subject: s390: Use system header file variant of include directive
X-Git-Tag: v6.15-rc1~113^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b337f6af6766da0790f8b50a1ca7ce67cfb5b69c;p=thirdparty%2Fkernel%2Flinux.git

s390: Use system header file variant of include directive

A few include directives use the local search variant even though the files
to be included aren't local. Therefore use the normal system header file
variant of the include directive.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index c328e05b584ca..ea4ddd37ea5a2 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -622,7 +622,7 @@ SYM_DATA_END(daton_psw)
 	.balign	8
 #define SYSCALL(esame,emu)	.quad __s390x_ ## esame
 SYM_DATA_START(sys_call_table)
-#include "asm/syscall_table.h"
+#include <asm/syscall_table.h>
 SYM_DATA_END(sys_call_table)
 #undef SYSCALL
 
@@ -630,7 +630,7 @@ SYM_DATA_END(sys_call_table)
 
 #define SYSCALL(esame,emu)	.quad __s390_ ## emu
 SYM_DATA_START(sys_call_table_emu)
-#include "asm/syscall_table.h"
+#include <asm/syscall_table.h>
 SYM_DATA_END(sys_call_table_emu)
 #undef SYSCALL
 #endif
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index e2acbbadc75e3..6f2ae0be22982 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -7,7 +7,6 @@
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
 
-#include "asm/ptrace.h"
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
@@ -33,6 +32,7 @@
 #include <asm/runtime_instr.h>
 #include <asm/facility.h>
 #include <asm/machine.h>
+#include <asm/ptrace.h>
 #include <asm/fpu.h>
 
 #include "entry.h"
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index a27053a405a74..6db2c14665314 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -13,8 +13,6 @@
  * 'Traps.c' handles hardware traps and faults after we have saved some
  * state in 'asm.s'.
  */
-#include "asm/irqflags.h"
-#include "asm/ptrace.h"
 #include <linux/cpufeature.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
@@ -30,6 +28,8 @@
 #include <linux/entry-common.h>
 #include <linux/kmsan.h>
 #include <asm/asm-extable.h>
+#include <asm/irqflags.h>
+#include <asm/ptrace.h>
 #include <asm/vtime.h>
 #include <asm/fpu.h>
 #include <asm/fault.h>