2023-12-31 12:20:56

by Yuntao Wang

Subject: [PATCH] x86/head: Simplify #include "../../x86/xen/xen-head.S"

Since `kernel/head_32.S`, `kernel/head_64.S`, and `xen/xen-head.S` are all
located in the same `arch/x86` directory, when `kernel/head_32.S` and
`kernel/head_64.S` want to include `xen/xen-head.S`, we can directly use
the `#include "../xen/xen-head.S"` directive rather than the more verbose
`#include "../../x86/xen/xen-head.S"` directive. They point to the same
file.

Signed-off-by: Yuntao Wang <[email protected]>
---
arch/x86/kernel/head_32.S | 2 +-
arch/x86/kernel/head_64.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 487ac57e2c81..7804fff8bf8e 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -500,7 +500,7 @@ __INITRODATA
int_msg:
.asciz "Unknown interrupt or fault at: %p %p %p\n"

-#include "../../x86/xen/xen-head.S"
+#include "../xen/xen-head.S"

/*
* The IDT and GDT 'descriptors' are a strange 48-bit object
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 0f8103240fda..af31200a2ebe 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -748,7 +748,7 @@ SYM_DATA(smpboot_control, .long 0)
SYM_DATA(phys_base, .quad 0x0)
EXPORT_SYMBOL(phys_base)

-#include "../../x86/xen/xen-head.S"
+#include "../xen/xen-head.S"

__PAGE_ALIGNED_BSS
SYM_DATA_START_PAGE_ALIGNED(empty_zero_page)
--
2.43.0

2024-03-25 16:36:45

by tip-bot2 for Tony Luck

Subject: [tip: x86/cleanups] x86/head: Simplify relative include path to xen-head.S

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: c3262d3d19d2d42705334e40d9c731c2a5df9eb5
Gitweb: https://git.kernel.org/tip/c3262d3d19d2d42705334e40d9c731c2a5df9eb5
Author: Yuntao Wang <[email protected]>
AuthorDate: Sun, 31 Dec 2023 20:19:04 +08:00
Committer: Borislav Petkov (AMD) <[email protected]>
CommitterDate: Mon, 25 Mar 2024 15:24:10 +01:00

x86/head: Simplify relative include path to xen-head.S

Fix the relative path specification in the include directives adding
xen-head.S to the kernel's head_*.S files since they both have
"arch/x86/" as prefix.

[ bp: Rewrite commit message. ]

Signed-off-by: Yuntao Wang <[email protected]>
Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/kernel/head_32.S | 2 +-
arch/x86/kernel/head_64.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index b50f364..78a6570 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -500,7 +500,7 @@ __INITRODATA
int_msg:
.asciz "Unknown interrupt or fault at: %p %p %p\n"

-#include "../../x86/xen/xen-head.S"
+#include "../xen/xen-head.S"

/*
* The IDT and GDT 'descriptors' are a strange 48-bit object
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index d8198fb..2f8a594 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -720,7 +720,7 @@ SYM_DATA(smpboot_control, .long 0)
SYM_DATA(phys_base, .quad 0x0)
EXPORT_SYMBOL(phys_base)

-#include "../../x86/xen/xen-head.S"
+#include "../xen/xen-head.S"

__PAGE_ALIGNED_BSS
SYM_DATA_START_PAGE_ALIGNED(empty_zero_page)