tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Claudio Imbrenda af941f3d ab73b29e

+2 -7
+1
arch/s390/include/asm/tlb.h
··· 36 36 37 37 #include <asm/tlbflush.h> 38 38 #include <asm-generic/tlb.h> 39 + #include <asm/gmap.h> 39 40 40 41 /* 41 42 * Release the page cache reference for a pte removed by
-1
arch/s390/include/asm/uv.h
··· 16 16 #include <linux/bug.h> 17 17 #include <linux/sched.h> 18 18 #include <asm/page.h> 19 - #include <asm/gmap.h> 20 19 #include <asm/asm.h> 21 20 22 21 #define UVC_CC_OK 0
+1
arch/s390/kvm/intercept.c
··· 16 16 #include <asm/irq.h> 17 17 #include <asm/sysinfo.h> 18 18 #include <asm/uv.h> 19 + #include <asm/gmap.h> 19 20 20 21 #include "kvm-s390.h" 21 22 #include "gaccess.h"
-1
arch/s390/mm/fault.c
··· 40 40 #include <asm/ptrace.h> 41 41 #include <asm/fault.h> 42 42 #include <asm/diag.h> 43 - #include <asm/gmap.h> 44 43 #include <asm/irq.h> 45 44 #include <asm/facility.h> 46 45 #include <asm/uv.h>
-1
arch/s390/mm/gmap.c
··· 24 24 #include <asm/machine.h> 25 25 #include <asm/gmap.h> 26 26 #include <asm/page.h> 27 - #include <asm/tlb.h> 28 27 29 28 /* 30 29 * The address is saved in a radix tree directly; NULL would be ambiguous,
-1
arch/s390/mm/init.c
··· 40 40 #include <asm/kfence.h> 41 41 #include <asm/dma.h> 42 42 #include <asm/abs_lowcore.h> 43 - #include <asm/tlb.h> 44 43 #include <asm/tlbflush.h> 45 44 #include <asm/sections.h> 46 45 #include <asm/sclp.h>
-2
arch/s390/mm/pgalloc.c
··· 12 12 #include <asm/mmu_context.h> 13 13 #include <asm/page-states.h> 14 14 #include <asm/pgalloc.h> 15 - #include <asm/gmap.h> 16 - #include <asm/tlb.h> 17 15 #include <asm/tlbflush.h> 18 16 19 17 unsigned long *crst_table_alloc(struct mm_struct *mm)
-1
arch/s390/mm/pgtable.c
··· 20 20 #include <linux/ksm.h> 21 21 #include <linux/mman.h> 22 22 23 - #include <asm/tlb.h> 24 23 #include <asm/tlbflush.h> 25 24 #include <asm/mmu_context.h> 26 25 #include <asm/page-states.h>