]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
mm: reorder includes after introduction of linux/pgtable.h
authorMike Rapoport <rppt@linux.ibm.com>
Tue, 9 Jun 2020 04:32:42 +0000 (21:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2020 16:39:13 +0000 (09:39 -0700)
commit65fddcfca8ad14778f71a57672fd01e8112d30fa
treea5cc52ea5cc9432c173f325f010b1b469e335373
parentca5999fde0a1761665a38e4c9a72dbcd7d190a81
mm: reorder includes after introduction of linux/pgtable.h

The replacement of <asm/pgrable.h> with <linux/pgtable.h> made the include
of the latter in the middle of asm includes.  Fix this up with the aid of
the below script and manual adjustments here and there.

import sys
import re

if len(sys.argv) is not 3:
    print "USAGE: %s <file> <header>" % (sys.argv[0])
    sys.exit(1)

hdr_to_move="#include <linux/%s>" % sys.argv[2]
moved = False
in_hdrs = False

with open(sys.argv[1], "r") as f:
    lines = f.readlines()
    for _line in lines:
line = _line.rstrip('
')
if line == hdr_to_move:
    continue
if line.startswith("#include <linux/"):
    in_hdrs = True
elif not moved and in_hdrs:
    moved = True
    print hdr_to_move
print line

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-4-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
265 files changed:
arch/alpha/kernel/proto.h
arch/arc/mm/highmem.c
arch/arc/mm/tlbex.S
arch/arm/include/asm/efi.h
arch/arm/include/asm/fixmap.h
arch/arm/kernel/head.S
arch/arm/kernel/suspend.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-integrator/core.c
arch/arm/mach-keystone/platsmp.c
arch/arm/mach-sa1100/hackkit.c
arch/arm/mach-zynq/common.c
arch/arm/mm/idmap.c
arch/arm/mm/mm.h
arch/arm/mm/proc-arm1020.S
arch/arm/mm/proc-arm1020e.S
arch/arm/mm/proc-arm1022.S
arch/arm/mm/proc-arm1026.S
arch/arm/mm/proc-arm720.S
arch/arm/mm/proc-arm740.S
arch/arm/mm/proc-arm7tdmi.S
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-arm922.S
arch/arm/mm/proc-arm925.S
arch/arm/mm/proc-arm926.S
arch/arm/mm/proc-arm940.S
arch/arm/mm/proc-arm946.S
arch/arm/mm/proc-arm9tdmi.S
arch/arm/mm/proc-fa526.S
arch/arm/mm/proc-feroceon.S
arch/arm/mm/proc-mohawk.S
arch/arm/mm/proc-sa110.S
arch/arm/mm/proc-sa1100.S
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S
arch/arm/mm/proc-xsc3.S
arch/arm/mm/proc-xscale.S
arch/arm/mm/pv-fixup-asm.S
arch/arm64/include/asm/io.h
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/include/asm/mmu_context.h
arch/arm64/include/asm/vmap_stack.h
arch/arm64/kernel/acpi.c
arch/arm64/kernel/head.S
arch/arm64/kernel/kaslr.c
arch/arm64/kernel/suspend.c
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/mm/proc.S
arch/ia64/kernel/entry.S
arch/ia64/kernel/head.S
arch/ia64/kernel/irq_ia64.c
arch/ia64/kernel/ivt.S
arch/ia64/kernel/kprobes.c
arch/ia64/kernel/mca_asm.S
arch/ia64/kernel/relocate_kernel.S
arch/ia64/kernel/setup.c
arch/ia64/kernel/uncached.c
arch/ia64/kernel/vmlinux.lds.S
arch/m68k/68000/m68VZ328.c
arch/m68k/include/asm/sun3xflop.h
arch/m68k/kernel/head.S
arch/microblaze/include/asm/pgalloc.h
arch/microblaze/kernel/hw_exception_handler.S
arch/microblaze/kernel/module.c
arch/microblaze/kernel/setup.c
arch/microblaze/mm/pgtable.c
arch/mips/jazz/irq.c
arch/mips/jazz/setup.c
arch/mips/kvm/mips.c
arch/mips/mm/tlbex.c
arch/nds32/include/asm/highmem.h
arch/nds32/kernel/head.S
arch/nios2/kernel/nios2_ksyms.c
arch/openrisc/include/asm/io.h
arch/openrisc/kernel/entry.S
arch/openrisc/kernel/head.S
arch/openrisc/kernel/or32_ksyms.c
arch/openrisc/mm/ioremap.c
arch/parisc/kernel/asm-offsets.c
arch/parisc/kernel/entry.S
arch/parisc/kernel/head.S
arch/parisc/kernel/pacache.S
arch/parisc/kernel/pdt.c
arch/powerpc/include/asm/fixmap.h
arch/powerpc/kernel/btext.c
arch/powerpc/kernel/fpu.S
arch/powerpc/kernel/head_32.S
arch/powerpc/kernel/head_40x.S
arch/powerpc/kernel/head_44x.S
arch/powerpc/kernel/head_8xx.S
arch/powerpc/kernel/head_fsl_booke.S
arch/powerpc/kernel/io-workarounds.c
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/mce_power.c
arch/powerpc/kernel/paca.c
arch/powerpc/kernel/prom.c
arch/powerpc/kernel/prom_init.c
arch/powerpc/kernel/rtas_pci.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/smp.c
arch/powerpc/kvm/book3s_64_mmu_radix.c
arch/powerpc/kvm/book3s_hv_nested.c
arch/powerpc/kvm/book3s_hv_rm_xics.c
arch/powerpc/kvm/book3s_hv_rm_xive.c
arch/powerpc/kvm/fpu.S
arch/powerpc/mm/book3s32/hash_low.S
arch/powerpc/mm/book3s64/hash_native.c
arch/powerpc/mm/book3s64/hash_utils.c
arch/powerpc/mm/book3s64/slb.c
arch/powerpc/mm/init-common.c
arch/powerpc/mm/nohash/tlb_low_64e.S
arch/powerpc/mm/ptdump/bats.c
arch/powerpc/platforms/85xx/corenet_generic.c
arch/powerpc/platforms/85xx/mpc85xx_cds.c
arch/powerpc/platforms/85xx/qemu_e500.c
arch/powerpc/platforms/85xx/sbc8548.c
arch/powerpc/platforms/85xx/smp.c
arch/powerpc/platforms/86xx/mpc86xx_smp.c
arch/powerpc/platforms/cell/cbe_regs.c
arch/powerpc/platforms/cell/interrupt.c
arch/powerpc/platforms/cell/pervasive.c
arch/powerpc/platforms/cell/smp.c
arch/powerpc/platforms/cell/spider-pic.c
arch/powerpc/platforms/chrp/pci.c
arch/powerpc/platforms/chrp/smp.c
arch/powerpc/platforms/powermac/smp.c
arch/powerpc/platforms/pseries/lpar.c
arch/powerpc/platforms/pseries/smp.c
arch/powerpc/sysdev/mpic.c
arch/riscv/include/asm/fixmap.h
arch/riscv/include/asm/io.h
arch/riscv/include/asm/kasan.h
arch/riscv/mm/cacheflush.c
arch/riscv/mm/kasan_init.c
arch/s390/boot/ipl_parm.c
arch/s390/boot/kaslr.c
arch/s390/include/asm/hugetlb.h
arch/s390/include/asm/kasan.h
arch/s390/kernel/asm-offsets.c
arch/s390/kvm/gaccess.c
arch/s390/kvm/kvm-s390.c
arch/s390/kvm/priv.c
arch/s390/mm/extmem.c
arch/s390/mm/gmap.c
arch/s390/mm/kasan_init.c
arch/sh/mm/pmb.c
arch/sparc/include/asm/floppy_32.h
arch/sparc/include/asm/highmem.h
arch/sparc/include/asm/io-unit.h
arch/sparc/include/asm/pgalloc_32.h
arch/sparc/kernel/cpu.c
arch/sparc/kernel/entry.S
arch/sparc/kernel/head_64.S
arch/sparc/kernel/ktlb.S
arch/sparc/kernel/pci.c
arch/sparc/kernel/sun4m_irq.c
arch/sparc/kernel/trampoline_64.S
arch/sparc/kernel/traps_32.c
arch/sparc/lib/clear_page.S
arch/sparc/mm/tsb.c
arch/sparc/mm/ultra.S
arch/unicore32/kernel/hibernate.c
arch/unicore32/kernel/hibernate_asm.S
arch/unicore32/mm/alignment.c
arch/unicore32/mm/proc-ucv2.S
arch/x86/boot/compressed/kaslr_64.c
arch/x86/include/asm/asm-prototypes.h
arch/x86/include/asm/efi.h
arch/x86/include/asm/xen/hypercall.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/apic/apic_numachip.c
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/crash_core_32.c
arch/x86/kernel/crash_core_64.c
arch/x86/kernel/early_printk.c
arch/x86/kernel/head64.c
arch/x86/kernel/head_64.S
arch/x86/kernel/i8259.c
arch/x86/kernel/irqinit.c
arch/x86/kernel/kprobes/core.c
arch/x86/kernel/kprobes/opt.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/reboot.c
arch/x86/kernel/smpboot.c
arch/x86/mm/cpu_entry_area.c
arch/x86/mm/ioremap.c
arch/x86/mm/kaslr.c
arch/x86/mm/mmio-mod.c
arch/x86/mm/pat/memtype_interval.c
arch/x86/mm/setup_nx.c
arch/x86/platform/efi/efi_32.c
arch/x86/platform/olpc/olpc_ofw.c
arch/x86/power/cpu.c
arch/x86/power/hibernate.c
arch/x86/power/hibernate_32.c
arch/x86/power/hibernate_64.c
arch/x86/realmode/init.c
arch/x86/xen/mmu_pv.c
arch/x86/xen/smp_pv.c
arch/xtensa/include/asm/fixmap.h
arch/xtensa/include/asm/highmem.h
arch/xtensa/include/asm/mmu_context.h
arch/xtensa/kernel/entry.S
arch/xtensa/kernel/traps.c
arch/xtensa/kernel/vectors.S
arch/xtensa/mm/cache.c
arch/xtensa/mm/ioremap.c
arch/xtensa/mm/misc.S
drivers/acpi/scan.c
drivers/atm/fore200e.c
drivers/block/z2ram.c
drivers/firmware/efi/arm-runtime.c
drivers/gpu/drm/drm_vm.c
drivers/infiniband/hw/qib/qib_file_ops.c
drivers/macintosh/macio-adb.c
drivers/macintosh/mediabay.c
drivers/macintosh/via-pmu.c
drivers/media/pci/bt8xx/bt878.c
drivers/media/pci/bt8xx/btcx-risc.c
drivers/media/pci/bt8xx/bttv-risc.c
drivers/media/v4l2-core/videobuf-dma-sg.c
drivers/media/v4l2-core/videobuf-vmalloc.c
drivers/net/ethernet/amd/7990.c
drivers/net/ethernet/amd/hplance.c
drivers/net/ethernet/amd/mvme147.c
drivers/net/ethernet/amd/sun3lance.c
drivers/net/ethernet/amd/sunlance.c
drivers/net/ethernet/apple/bmac.c
drivers/net/ethernet/apple/mace.c
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
drivers/net/ethernet/freescale/fs_enet/mii-fec.c
drivers/net/ethernet/i825xx/82596.c
drivers/net/ethernet/korina.c
drivers/net/ethernet/marvell/pxa168_eth.c
drivers/net/ethernet/natsemi/jazzsonic.c
drivers/net/ethernet/natsemi/macsonic.c
drivers/net/ethernet/natsemi/xtsonic.c
drivers/net/ethernet/sun/sunbmac.c
drivers/net/ethernet/sun/sunqe.c
drivers/scsi/53c700.c
drivers/scsi/arm/cumana_2.c
drivers/scsi/arm/eesox.c
drivers/scsi/arm/powertec.c
drivers/scsi/dpt_i2o.c
drivers/scsi/mac53c94.c
drivers/scsi/mesh.c
drivers/scsi/qlogicpti.c
drivers/scsi/zorro_esp.c
include/linux/crash_dump.h
include/linux/io-mapping.h
include/linux/kasan.h
include/linux/mm.h
include/xen/arm/page.h
mm/init-mm.c
mm/mincore.c
mm/zsmalloc.c
sound/pci/hda/hda_intel.c
sound/soc/intel/common/sst-firmware.c
sound/soc/intel/haswell/sst-haswell-pcm.c