aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2022-01-08 22:44:16 +0100
committerIngo Molnar <mingo@kernel.org>2022-03-15 12:57:43 +0100
commitee0a2513c03f3fc6856c46822176b0b9cefc50f8 (patch)
treed29e4c164075f25203496b1d319c4c929def48d4
parentb59d8a6f42abccd4559417a885ac3e72b1b93436 (diff)
downloadtip-ee0a2513c03f3fc6856c46822176b0b9cefc50f8.tar.gz
headers/deps: x86/asm: Optimize <asm/segment.h> dependencies, remove <asm/segment_api.h> inclusion
-------------------------------------------------------------------- | Combined, preprocessed C code size of header, without line markers, | with comments stripped: ------------------------- before: | #include <asm/segment.h> | LOC: 1,752 | headers: 104 after: | #include <asm/segment.h> | LOC: 20 | headers: 17 Fix dangling dependencies. Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/boot/compressed/idt_handlers_64.S1
-rw-r--r--arch/x86/include/asm/elf_api.h1
-rw-r--r--arch/x86/include/asm/mmu_context.h1
-rw-r--r--arch/x86/include/asm/segment.h1
4 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/idt_handlers_64.S b/arch/x86/boot/compressed/idt_handlers_64.S
index 22890e199f5b44..8457f16de9b252 100644
--- a/arch/x86/boot/compressed/idt_handlers_64.S
+++ b/arch/x86/boot/compressed/idt_handlers_64.S
@@ -8,6 +8,7 @@
*/
#include <asm/segment.h>
+#include <linux/linkage.h>
/* For ORIG_RAX */
#include "../../entry/calling.h"
diff --git a/arch/x86/include/asm/elf_api.h b/arch/x86/include/asm/elf_api.h
index abf60e2ba5e072..b3b299e81b9654 100644
--- a/arch/x86/include/asm/elf_api.h
+++ b/arch/x86/include/asm/elf_api.h
@@ -11,6 +11,7 @@
#include <asm/user.h>
#include <asm/auxvec.h>
#include <asm/fsgsbase.h>
+#include <asm/segment_api.h>
#include <asm/vdso.h>
diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index 125699bf768ad2..79c5904b07ac63 100644
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
@@ -2,6 +2,7 @@
#ifndef _ASM_X86_MMU_CONTEXT_H
#define _ASM_X86_MMU_CONTEXT_H
+#include <asm/segment_api.h>
#include <asm/pgtable_api_access.h>
#include <linux/mm_api.h>
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index b98cc37759ce7f..a2728490380d94 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -3,6 +3,5 @@
#define _ASM_X86_SEGMENT_H
#include <asm/segment_types.h>
-#include <asm/segment_api.h>
#endif /* _ASM_X86_SEGMENT_H */