Skip to content

Commit 757f1be

Browse files
committed
s390: Remove unneeded includes
JIRA: https://issues.redhat.com/browse/RHEL-113440 commit af941f3 Author: Claudio Imbrenda <imbrenda@linux.ibm.com> Date: Wed May 28 11:54:59 2025 +0200 s390: Remove unneeded includes Many files don't need to include asm/tlb.h or asm/gmap.h. On the other hand, asm/tlb.h does need to include asm/gmap.h. Remove all unneeded includes so that asm/tlb.h is not directly used by s390 arch code anymore. Remove asm/gmap.h from a few other files as well, so that now only KVM code, mm/gmap.c, and asm/tlb.h include it. Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com> Reviewed-by: Steffen Eiden <seiden@linux.ibm.com> Acked-by: Heiko Carstens <hca@linux.ibm.com> Link: https://lore.kernel.org/r/20250528095502.226213-2-imbrenda@linux.ibm.com Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Message-ID: <20250528095502.226213-2-imbrenda@linux.ibm.com> Conflicts: arch/s390/mm/pgalloc.c ("#include <asm/tlb.h>" cannot be removed here yet, compilation breaks otherwise due to some other missing patches in downstream) Signed-off-by: Thomas Huth <thuth@redhat.com>
1 parent 1b98f0d commit 757f1be

File tree

8 files changed

+2
-6
lines changed

8 files changed

+2
-6
lines changed

arch/s390/include/asm/tlb.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ static inline bool __tlb_remove_folio_pages(struct mmu_gather *tlb,
3737

3838
#include <asm/tlbflush.h>
3939
#include <asm-generic/tlb.h>
40+
#include <asm/gmap.h>
4041

4142
/*
4243
* Release the page cache reference for a pte removed by

arch/s390/include/asm/uv.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/bug.h>
1717
#include <linux/sched.h>
1818
#include <asm/page.h>
19-
#include <asm/gmap.h>
2019
#include <asm/asm.h>
2120

2221
#define UVC_CC_OK 0

arch/s390/kvm/intercept.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <asm/irq.h>
1717
#include <asm/sysinfo.h>
1818
#include <asm/uv.h>
19+
#include <asm/gmap.h>
1920

2021
#include "kvm-s390.h"
2122
#include "gaccess.h"

arch/s390/mm/fault.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include <asm/ptrace.h>
4141
#include <asm/fault.h>
4242
#include <asm/diag.h>
43-
#include <asm/gmap.h>
4443
#include <asm/irq.h>
4544
#include <asm/facility.h>
4645
#include <asm/uv.h>

arch/s390/mm/gmap.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <asm/pgalloc.h>
2323
#include <asm/gmap.h>
2424
#include <asm/page.h>
25-
#include <asm/tlb.h>
2625

2726
/*
2827
* The address is saved in a radix tree directly; NULL would be ambiguous,

arch/s390/mm/init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include <asm/kfence.h>
4040
#include <asm/dma.h>
4141
#include <asm/abs_lowcore.h>
42-
#include <asm/tlb.h>
4342
#include <asm/tlbflush.h>
4443
#include <asm/sections.h>
4544
#include <asm/sclp.h>

arch/s390/mm/pgalloc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <asm/mmu_context.h>
1313
#include <asm/page-states.h>
1414
#include <asm/pgalloc.h>
15-
#include <asm/gmap.h>
1615
#include <asm/tlb.h>
1716
#include <asm/tlbflush.h>
1817

arch/s390/mm/pgtable.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/ksm.h>
2020
#include <linux/mman.h>
2121

22-
#include <asm/tlb.h>
2322
#include <asm/tlbflush.h>
2423
#include <asm/mmu_context.h>
2524
#include <asm/page-states.h>

0 commit comments

Comments
 (0)