diff options
| author | Mike Rapoport <rppt@linux.vnet.ibm.com> | 2018-10-30 18:09:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-31 11:54:16 -0400 |
| commit | 57c8a661d95dff48dd9c2f2496139082bbaf241a (patch) | |
| tree | a4d49d0232149047f9c0032e22b7fa779e75d61f | |
| parent | 97ad1087efffed26cb00e310a927f9603332dfcb (diff) | |
mm: remove include/linux/bootmem.h
Move remaining definitions and declarations from include/linux/bootmem.h
into include/linux/memblock.h and remove the redundant header.
The includes were replaced with the semantic patch below and then
semi-automated removal of duplicated '#include <linux/memblock.h>
@@
@@
- #include <linux/bootmem.h>
+ #include <linux/memblock.h>
[sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h]
Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au
[sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h]
Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au
[sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal]
Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au
Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Michal Hocko <mhocko@suse.com>
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 Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
275 files changed, 353 insertions, 476 deletions
diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c index 026ee955fd10..867e8730b0c5 100644 --- a/arch/alpha/kernel/core_cia.c +++ b/arch/alpha/kernel/core_cia.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/bootmem.h> | 24 | #include <linux/memblock.h> |
| 25 | 25 | ||
| 26 | #include <asm/ptrace.h> | 26 | #include <asm/ptrace.h> |
| 27 | #include <asm/mce.h> | 27 | #include <asm/mce.h> |
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c index 35572be9deb5..a9fd133a7fb2 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/initrd.h> | 22 | #include <linux/initrd.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | 24 | ||
| 26 | #include <asm/ptrace.h> | 25 | #include <asm/ptrace.h> |
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index 1f00c9433b10..8a568c4d8e81 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/mc146818rtc.h> | 18 | #include <linux/mc146818rtc.h> |
| 19 | #include <linux/rtc.h> | 19 | #include <linux/rtc.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | 22 | ||
| 23 | #include <asm/ptrace.h> | 23 | #include <asm/ptrace.h> |
| 24 | #include <asm/smp.h> | 24 | #include <asm/smp.h> |
diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 132b06bdf903..97551597581b 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | 20 | ||
| 21 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
| 22 | #include <asm/smp.h> | 22 | #include <asm/smp.h> |
diff --git a/arch/alpha/kernel/core_tsunami.c b/arch/alpha/kernel/core_tsunami.c index e7c956ea46b6..f334b8928d72 100644 --- a/arch/alpha/kernel/core_tsunami.c +++ b/arch/alpha/kernel/core_tsunami.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | 21 | ||
| 22 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
| 23 | #include <asm/smp.h> | 23 | #include <asm/smp.h> |
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 59cbfc2bf2c5..a9378ee0c2f1 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/gfp.h> | 11 | #include <linux/gfp.h> |
| 12 | #include <linux/capability.h> | 12 | #include <linux/capability.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 4cc3eb92f55b..13937e72d875 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/cache.h> | 23 | #include <linux/cache.h> |
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 5d178c7ba5b2..82cf950bda2a 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| 8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 9 | #include <linux/gfp.h> | 9 | #include <linux/gfp.h> |
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/export.h> | 11 | #include <linux/export.h> |
| 12 | #include <linux/scatterlist.h> | 12 | #include <linux/scatterlist.h> |
| 13 | #include <linux/log2.h> | 13 | #include <linux/log2.h> |
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 64c06a0adf3d..a37fd990bd55 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
| 31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
| 32 | #include <linux/bootmem.h> | ||
| 33 | #include <linux/memblock.h> | 32 | #include <linux/memblock.h> |
| 34 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 35 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index ff4f54b86c7f..cd9a112d67ff 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/reboot.h> | 34 | #include <linux/reboot.h> |
| 35 | #include <linux/bootmem.h> | 35 | #include <linux/memblock.h> |
| 36 | #include <linux/bitops.h> | 36 | #include <linux/bitops.h> |
| 37 | 37 | ||
| 38 | #include <asm/ptrace.h> | 38 | #include <asm/ptrace.h> |
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 853d15344934..a42fc5c4db89 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/swap.h> | 20 | #include <linux/swap.h> |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/bootmem.h> /* max_low_pfn */ | 22 | #include <linux/memblock.h> /* max_low_pfn */ |
| 23 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
| 24 | #include <linux/gfp.h> | 24 | #include <linux/gfp.h> |
| 25 | 25 | ||
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index 26cd925d19b1..74846553e3f1 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 13 | #include <linux/bootmem.h> | ||
| 14 | #include <linux/memblock.h> | 13 | #include <linux/memblock.h> |
| 15 | #include <linux/swap.h> | 14 | #include <linux/swap.h> |
| 16 | #include <linux/initrd.h> | 15 | #include <linux/initrd.h> |
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 2a01dd1005f4..d34f69eb1a95 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/bootmem.h> | 18 | #include <linux/memblock.h> |
| 19 | #include <linux/sort.h> | 19 | #include <linux/sort.h> |
| 20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 21 | #include <linux/stop_machine.h> | 21 | #include <linux/stop_machine.h> |
diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c index f582dc8944c9..48e700151810 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/export.h> | 11 | #include <linux/export.h> |
| 12 | #include <linux/highmem.h> | 12 | #include <linux/highmem.h> |
| 13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index 0f29c6548779..f8fe5668b30f 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/bootmem.h> | ||
| 12 | #include <linux/memblock.h> | 11 | #include <linux/memblock.h> |
| 13 | #ifdef CONFIG_BLK_DEV_INITRD | 12 | #ifdef CONFIG_BLK_DEV_INITRD |
| 14 | #include <linux/initrd.h> | 13 | #include <linux/initrd.h> |
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 13bcd3b867cb..e3057c1b55b9 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/export.h> | 12 | #include <linux/export.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/bootmem.h> | ||
| 16 | #include <linux/memblock.h> | 15 | #include <linux/memblock.h> |
| 17 | #include <linux/of.h> | 16 | #include <linux/of.h> |
| 18 | #include <linux/of_fdt.h> | 17 | #include <linux/of_fdt.h> |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 39e6090d23ac..840a4adc69fc 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/utsname.h> | 16 | #include <linux/utsname.h> |
| 17 | #include <linux/initrd.h> | 17 | #include <linux/initrd.h> |
| 18 | #include <linux/console.h> | 18 | #include <linux/console.h> |
| 19 | #include <linux/bootmem.h> | ||
| 20 | #include <linux/seq_file.h> | 19 | #include <linux/seq_file.h> |
| 21 | #include <linux/screen_info.h> | 20 | #include <linux/screen_info.h> |
| 22 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 1f9b34a7eccd..cd5732ab0cdf 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
| @@ -141,7 +141,7 @@ | |||
| 141 | #include <linux/cpu.h> | 141 | #include <linux/cpu.h> |
| 142 | #include <linux/of.h> | 142 | #include <linux/of.h> |
| 143 | #include <linux/of_address.h> | 143 | #include <linux/of_address.h> |
| 144 | #include <linux/bootmem.h> | 144 | #include <linux/memblock.h> |
| 145 | 145 | ||
| 146 | #include <linux/platform_data/ti-sysc.h> | 146 | #include <linux/platform_data/ti-sysc.h> |
| 147 | 147 | ||
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 66566472c153..661fe48ab78d 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * | 9 | * |
| 10 | * DMA uncached mapping support. | 10 | * DMA uncached mapping support. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/bootmem.h> | ||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | #include <linux/genalloc.h> | 14 | #include <linux/genalloc.h> |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index d421a10c93a8..32e4845af2b6 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 12 | #include <linux/swap.h> | 12 | #include <linux/swap.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/bootmem.h> | ||
| 15 | #include <linux/mman.h> | 14 | #include <linux/mman.h> |
| 16 | #include <linux/sched/signal.h> | 15 | #include <linux/sched/signal.h> |
| 17 | #include <linux/sched/task.h> | 16 | #include <linux/sched/task.h> |
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index 785d2a562a23..cb44aa290e73 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #include <linux/cpu.h> | 1 | #include <linux/cpu.h> |
| 2 | #include <linux/dma-mapping.h> | 2 | #include <linux/dma-mapping.h> |
| 3 | #include <linux/bootmem.h> | ||
| 4 | #include <linux/gfp.h> | 3 | #include <linux/gfp.h> |
| 5 | #include <linux/highmem.h> | 4 | #include <linux/highmem.h> |
| 6 | #include <linux/export.h> | 5 | #include <linux/export.h> |
diff --git a/arch/arm/xen/p2m.c b/arch/arm/xen/p2m.c index 0641ba54ab62..e70a49fc8dcd 100644 --- a/arch/arm/xen/p2m.c +++ b/arch/arm/xen/p2m.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include <linux/bootmem.h> | 1 | #include <linux/memblock.h> |
| 2 | #include <linux/gfp.h> | 2 | #include <linux/gfp.h> |
| 3 | #include <linux/export.h> | 3 | #include <linux/export.h> |
| 4 | #include <linux/spinlock.h> | 4 | #include <linux/spinlock.h> |
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index ed46dc188b22..44e3c351e1ea 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #define pr_fmt(fmt) "ACPI: " fmt | 16 | #define pr_fmt(fmt) "ACPI: " fmt |
| 17 | 17 | ||
| 18 | #include <linux/acpi.h> | 18 | #include <linux/acpi.h> |
| 19 | #include <linux/bootmem.h> | ||
| 20 | #include <linux/cpumask.h> | 19 | #include <linux/cpumask.h> |
| 21 | #include <linux/efi.h> | 20 | #include <linux/efi.h> |
| 22 | #include <linux/efi-bgrt.h> | 21 | #include <linux/efi-bgrt.h> |
diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c index 4f4f1815e047..eac1d0cc595c 100644 --- a/arch/arm64/kernel/acpi_numa.c +++ b/arch/arm64/kernel/acpi_numa.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/acpi.h> | 19 | #include <linux/acpi.h> |
| 20 | #include <linux/bitmap.h> | 20 | #include <linux/bitmap.h> |
| 21 | #include <linux/bootmem.h> | ||
| 22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 3428427f6c93..7ce7306f1d75 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/initrd.h> | 26 | #include <linux/initrd.h> |
| 27 | #include <linux/console.h> | 27 | #include <linux/console.h> |
| 28 | #include <linux/cache.h> | 28 | #include <linux/cache.h> |
| 29 | #include <linux/bootmem.h> | ||
| 30 | #include <linux/screen_info.h> | 29 | #include <linux/screen_info.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/kexec.h> | 31 | #include <linux/kexec.h> |
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index d190612b8f33..3a703e5d4e32 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/gfp.h> | 20 | #include <linux/gfp.h> |
| 21 | #include <linux/acpi.h> | 21 | #include <linux/acpi.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/cache.h> | 23 | #include <linux/cache.h> |
| 24 | #include <linux/export.h> | 24 | #include <linux/export.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index d8d73073835f..9d9582cac6c4 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 23 | #include <linux/swap.h> | 23 | #include <linux/swap.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/bootmem.h> | ||
| 26 | #include <linux/cache.h> | 25 | #include <linux/cache.h> |
| 27 | #include <linux/mman.h> | 26 | #include <linux/mman.h> |
| 28 | #include <linux/nodemask.h> | 27 | #include <linux/nodemask.h> |
diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 6a65a2912d36..63527e585aac 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #define pr_fmt(fmt) "kasan: " fmt | 13 | #define pr_fmt(fmt) "kasan: " fmt |
| 14 | #include <linux/bootmem.h> | ||
| 15 | #include <linux/kasan.h> | 14 | #include <linux/kasan.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 17 | #include <linux/sched/task.h> | 16 | #include <linux/sched/task.h> |
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 0bff116c07a8..27a31efd9e8e 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #define pr_fmt(fmt) "NUMA: " fmt | 20 | #define pr_fmt(fmt) "NUMA: " fmt |
| 21 | 21 | ||
| 22 | #include <linux/acpi.h> | 22 | #include <linux/acpi.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c index 05d96a9541b5..2e1c0ea22eb0 100644 --- a/arch/c6x/kernel/setup.c +++ b/arch/c6x/kernel/setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
| 12 | #include <linux/memblock.h> | 12 | #include <linux/memblock.h> |
| 13 | #include <linux/seq_file.h> | 13 | #include <linux/seq_file.h> |
| 14 | #include <linux/bootmem.h> | ||
| 15 | #include <linux/clkdev.h> | 14 | #include <linux/clkdev.h> |
| 16 | #include <linux/initrd.h> | 15 | #include <linux/initrd.h> |
| 17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c index 3383df8b3508..af5ada0520be 100644 --- a/arch/c6x/mm/init.c +++ b/arch/c6x/mm/init.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 12 | #include <linux/swap.h> | 12 | #include <linux/swap.h> |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #ifdef CONFIG_BLK_DEV_RAM | 15 | #ifdef CONFIG_BLK_DEV_RAM |
| 16 | #include <linux/blkdev.h> | 16 | #include <linux/blkdev.h> |
| 17 | #endif | 17 | #endif |
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index 34e2df5c0d6d..b32bfa1fe99e 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/console.h> | 18 | #include <linux/console.h> |
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/bootmem.h> | ||
| 22 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
| 23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 24 | #include <linux/of.h> | 23 | #include <linux/of.h> |
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c index f2bf4487aabd..6519252ac4db 100644 --- a/arch/h8300/mm/init.c +++ b/arch/h8300/mm/init.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/highmem.h> | 31 | #include <linux/highmem.h> |
| 32 | #include <linux/pagemap.h> | 32 | #include <linux/pagemap.h> |
| 33 | #include <linux/bootmem.h> | 33 | #include <linux/memblock.h> |
| 34 | #include <linux/gfp.h> | 34 | #include <linux/gfp.h> |
| 35 | 35 | ||
| 36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c index 706699374444..38eaa7b703e7 100644 --- a/arch/hexagon/kernel/dma.c +++ b/arch/hexagon/kernel/dma.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/dma-noncoherent.h> | 21 | #include <linux/dma-noncoherent.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/genalloc.h> | 23 | #include <linux/genalloc.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <asm/page.h> | 25 | #include <asm/page.h> |
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c index dc8c7e75b5d1..b3c3e04d4e57 100644 --- a/arch/hexagon/kernel/setup.c +++ b/arch/hexagon/kernel/setup.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/mmzone.h> | 24 | #include <linux/mmzone.h> |
| 25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 26 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c index 88643faf3981..1719ede9e9bd 100644 --- a/arch/hexagon/mm/init.c +++ b/arch/hexagon/mm/init.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | #include <asm/atomic.h> | 24 | #include <asm/atomic.h> |
| 26 | #include <linux/highmem.h> | 25 | #include <linux/highmem.h> |
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c index 39f4433a6f0e..bec762a9b418 100644 --- a/arch/ia64/kernel/crash.c +++ b/arch/ia64/kernel/crash.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/smp.h> | 12 | #include <linux/smp.h> |
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/crash_dump.h> | 14 | #include <linux/crash_dump.h> |
| 15 | #include <linux/bootmem.h> | 15 | #include <linux/memblock.h> |
| 16 | #include <linux/kexec.h> | 16 | #include <linux/kexec.h> |
| 17 | #include <linux/elfcore.h> | 17 | #include <linux/elfcore.h> |
| 18 | #include <linux/sysctl.h> | 18 | #include <linux/sysctl.h> |
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index f77d80edddfe..8f106638913c 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | * Skip non-WB memory and ignore empty memory ranges. | 23 | * Skip non-WB memory and ignore empty memory ranges. |
| 24 | */ | 24 | */ |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/crash_dump.h> | 27 | #include <linux/crash_dump.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index 6b51c88e3578..b49fe6f618ed 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #ifdef CONFIG_VIRTUAL_MEM_MAP | 6 | #ifdef CONFIG_VIRTUAL_MEM_MAP |
| 7 | #include <linux/compiler.h> | 7 | #include <linux/compiler.h> |
| 8 | #include <linux/export.h> | 8 | #include <linux/export.h> |
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/memblock.h> |
| 10 | EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not exported by generic code */ | 10 | EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not exported by generic code */ |
| 11 | EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic code */ | 11 | EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic code */ |
| 12 | #endif | 12 | #endif |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 550243a94b5d..fe6e4946672e 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | #include <linux/slab.h> | 90 | #include <linux/slab.h> |
| 91 | #include <linux/smp.h> | 91 | #include <linux/smp.h> |
| 92 | #include <linux/string.h> | 92 | #include <linux/string.h> |
| 93 | #include <linux/bootmem.h> | 93 | #include <linux/memblock.h> |
| 94 | 94 | ||
| 95 | #include <asm/delay.h> | 95 | #include <asm/delay.h> |
| 96 | #include <asm/hw_irq.h> | 96 | #include <asm/hw_irq.h> |
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 71209766c47f..9a6603f8e409 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | #include <linux/sched/task.h> | 77 | #include <linux/sched/task.h> |
| 78 | #include <linux/interrupt.h> | 78 | #include <linux/interrupt.h> |
| 79 | #include <linux/irq.h> | 79 | #include <linux/irq.h> |
| 80 | #include <linux/bootmem.h> | 80 | #include <linux/memblock.h> |
| 81 | #include <linux/acpi.h> | 81 | #include <linux/acpi.h> |
| 82 | #include <linux/timer.h> | 82 | #include <linux/timer.h> |
| 83 | #include <linux/module.h> | 83 | #include <linux/module.h> |
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index dfe40cbdf3b3..45f956ad715a 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 16 | #include <linux/kallsyms.h> | 16 | #include <linux/kallsyms.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <linux/acpi.h> | 18 | #include <linux/acpi.h> |
| 19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 0e6c2d9fb498..583a3746d70b 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | 28 | ||
| 29 | #include <linux/acpi.h> | 29 | #include <linux/acpi.h> |
| 30 | #include <linux/bootmem.h> | ||
| 31 | #include <linux/console.h> | 30 | #include <linux/console.h> |
| 32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 33 | #include <linux/cpu.h> | 32 | #include <linux/cpu.h> |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 74fe317477e6..51ec944b036c 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/acpi.h> | 26 | #include <linux/acpi.h> |
| 27 | #include <linux/bootmem.h> | 27 | #include <linux/memblock.h> |
| 28 | #include <linux/cpu.h> | 28 | #include <linux/cpu.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 9b820f7a6a98..e311ee13e61d 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/node.h> | 19 | #include <linux/node.h> |
| 20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/nodemask.h> | 23 | #include <linux/nodemask.h> |
| 24 | #include <linux/notifier.h> | 24 | #include <linux/notifier.h> |
| 25 | #include <linux/export.h> | 25 | #include <linux/export.h> |
diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c index e04efa088902..7601fe0622d2 100644 --- a/arch/ia64/kernel/unwind.c +++ b/arch/ia64/kernel/unwind.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | * acquired, then the read-write lock must be acquired first. | 28 | * acquired, then the read-write lock must be acquired first. |
| 29 | */ | 29 | */ |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/bootmem.h> | 31 | #include <linux/memblock.h> |
| 32 | #include <linux/elf.h> | 32 | #include <linux/elf.h> |
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 9e5c23a6b8b4..6e447234205c 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * Routines used by ia64 machines with contiguous (or virtually contiguous) | 14 | * Routines used by ia64 machines with contiguous (or virtually contiguous) |
| 15 | * memory. | 15 | * memory. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/bootmem.h> | ||
| 18 | #include <linux/efi.h> | 17 | #include <linux/efi.h> |
| 19 | #include <linux/memblock.h> | 18 | #include <linux/memblock.h> |
| 20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 70609f823960..8a965784340c 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/nmi.h> | 20 | #include <linux/nmi.h> |
| 21 | #include <linux/swap.h> | 21 | #include <linux/swap.h> |
| 22 | #include <linux/bootmem.h> | ||
| 23 | #include <linux/memblock.h> | 22 | #include <linux/memblock.h> |
| 24 | #include <linux/acpi.h> | 23 | #include <linux/acpi.h> |
| 25 | #include <linux/efi.h> | 24 | #include <linux/efi.h> |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 43ea4a47163d..d5e12ff1d73c 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | 10 | ||
| 11 | #include <linux/bootmem.h> | ||
| 12 | #include <linux/efi.h> | 11 | #include <linux/efi.h> |
| 13 | #include <linux/elf.h> | 12 | #include <linux/elf.h> |
| 14 | #include <linux/memblock.h> | 13 | #include <linux/memblock.h> |
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index aa19b7ac8222..3861d6e32d5f 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/node.h> | 16 | #include <linux/node.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/bootmem.h> | 18 | #include <linux/memblock.h> |
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <asm/mmzone.h> | 20 | #include <asm/mmzone.h> |
| 21 | #include <asm/numa.h> | 21 | #include <asm/numa.h> |
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index 5554863b4c9b..ab545daff7c3 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/smp.h> | 22 | #include <linux/smp.h> |
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/bootmem.h> | 24 | #include <linux/memblock.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | 26 | ||
| 27 | #include <asm/delay.h> | 27 | #include <asm/delay.h> |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 5d71800df431..196a0dd7ff97 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/export.h> | 24 | #include <linux/export.h> |
| 25 | 25 | ||
| 26 | #include <asm/machvec.h> | 26 | #include <asm/machvec.h> |
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c index 9146192b86f5..9900e6d4add6 100644 --- a/arch/ia64/sn/kernel/bte.c +++ b/arch/ia64/sn/kernel/bte.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <asm/nodedata.h> | 16 | #include <asm/nodedata.h> |
| 17 | #include <asm/delay.h> | 17 | #include <asm/delay.h> |
| 18 | 18 | ||
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c index 8b05d5581615..98f55220c67d 100644 --- a/arch/ia64/sn/kernel/io_common.c +++ b/arch/ia64/sn/kernel/io_common.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Copyright (C) 2006 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 2006 Silicon Graphics, Inc. All rights reserved. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/memblock.h> |
| 10 | #include <linux/export.h> | 10 | #include <linux/export.h> |
| 11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
| 12 | #include <asm/sn/types.h> | 12 | #include <asm/sn/types.h> |
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index ab2564f95199..71ad6b0ccab4 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 21 | #include <linux/serial.h> | 21 | #include <linux/serial.h> |
| 22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/mmzone.h> | 24 | #include <linux/mmzone.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/acpi.h> | 26 | #include <linux/acpi.h> |
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index 1089d67df315..6ffc204eb07d 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
| 19 | #include <linux/pagemap.h> | 19 | #include <linux/pagemap.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/mount.h> | 21 | #include <linux/mount.h> |
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c index adad03ca6e11..360c723c0ae6 100644 --- a/arch/m68k/coldfire/m54xx.c +++ b/arch/m68k/coldfire/m54xx.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <asm/pgalloc.h> | 20 | #include <asm/pgalloc.h> |
| 21 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
| 22 | #include <asm/coldfire.h> | 22 | #include <asm/coldfire.h> |
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 5d3596c180f9..a1a3eaeaf58c 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
| 26 | #include <linux/seq_file.h> | 25 | #include <linux/seq_file.h> |
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index cfd5475bfc31..3c5def10d486 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/console.h> | 27 | #include <linux/console.h> |
| 28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/bootmem.h> | ||
| 31 | #include <linux/memblock.h> | 30 | #include <linux/memblock.h> |
| 32 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c index 107082877064..1b4c562753da 100644 --- a/arch/m68k/kernel/uboot.c +++ b/arch/m68k/kernel/uboot.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/console.h> | 16 | #include <linux/console.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/seq_file.h> | 20 | #include <linux/seq_file.h> |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/initrd.h> | 22 | #include <linux/initrd.h> |
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index ae49ae4d3049..933c33e76a48 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/gfp.h> | 21 | #include <linux/gfp.h> |
| 22 | 22 | ||
| 23 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |
diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c index 38a1d92dd555..0de4999a3810 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/bootmem.h> | ||
| 17 | #include <linux/memblock.h> | 16 | #include <linux/memblock.h> |
| 18 | 17 | ||
| 19 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 2113eec8dbf9..7497cf30bf1c 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/bootmem.h> | ||
| 22 | #include <linux/memblock.h> | 21 | #include <linux/memblock.h> |
| 23 | #include <linux/gfp.h> | 22 | #include <linux/gfp.h> |
| 24 | 23 | ||
diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c index 19c05ab9824d..f736db48a2e1 100644 --- a/arch/m68k/mm/sun3mmu.c +++ b/arch/m68k/mm/sun3mmu.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | 20 | ||
| 21 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
| 22 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 79a2bb857906..542c4404861c 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/tty.h> | 15 | #include <linux/tty.h> |
| 16 | #include <linux/console.h> | 16 | #include <linux/console.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/bootmem.h> | 18 | #include <linux/memblock.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | 20 | ||
| 21 | #include <asm/oplib.h> | 21 | #include <asm/oplib.h> |
diff --git a/arch/m68k/sun3/dvma.c b/arch/m68k/sun3/dvma.c index 5f92c72b05c3..a2c1c9304895 100644 --- a/arch/m68k/sun3/dvma.c +++ b/arch/m68k/sun3/dvma.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index d30da12a1702..582a1284059a 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/ptrace.h> | 14 | #include <linux/ptrace.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/bitops.h> | 17 | #include <linux/bitops.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/sched/mm.h> | 19 | #include <linux/sched/mm.h> |
diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index 72d94585b52e..8be8b750c629 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Contains common routines for sun3/sun3x DVMA management. | 7 | * Contains common routines for sun3/sun3x DVMA management. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c index b2acbc862f60..89e630e66555 100644 --- a/arch/m68k/sun3x/dvma.c +++ b/arch/m68k/sun3x/dvma.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/bootmem.h> | 18 | #include <linux/memblock.h> |
| 19 | #include <linux/vmalloc.h> | 19 | #include <linux/vmalloc.h> |
| 20 | 20 | ||
| 21 | #include <asm/sun3x.h> | 21 | #include <asm/sun3x.h> |
diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c index d801cc5f5b95..45e0a1aa9357 100644 --- a/arch/microblaze/mm/consistent.c +++ b/arch/microblaze/mm/consistent.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/vmalloc.h> | 28 | #include <linux/vmalloc.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/bootmem.h> | 31 | #include <linux/memblock.h> |
| 32 | #include <linux/highmem.h> | 32 | #include <linux/highmem.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 9989740d397a..8c14988f52f2 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
| @@ -7,10 +7,9 @@ | |||
| 7 | * for more details. | 7 | * for more details. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/memblock.h> | ||
| 14 | #include <linux/mm.h> /* mem_init */ | 13 | #include <linux/mm.h> /* mem_init */ |
| 15 | #include <linux/initrd.h> | 14 | #include <linux/initrd.h> |
| 16 | #include <linux/pagemap.h> | 15 | #include <linux/pagemap.h> |
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 2ffd171af8b6..6b89a66ec1a5 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/shmem_fs.h> | 25 | #include <linux/shmem_fs.h> |
| 26 | #include <linux/list.h> | 26 | #include <linux/list.h> |
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c index 0332f0514d05..80390a9ec264 100644 --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | * along with this program; if not, write to the Free Software | 16 | * along with this program; if not, write to the Free Software |
| 17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 17 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 18 | */ | 18 | */ |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/pfn.h> | 22 | #include <linux/pfn.h> |
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index 4c7a93f4039a..9728abcb18fa 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/clk-provider.h> | 20 | #include <linux/clk-provider.h> |
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c index 7019e2967009..77a836e661c9 100644 --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/smp.h> | 11 | #include <linux/smp.h> |
| 12 | #include <asm/bootinfo.h> | 12 | #include <asm/bootinfo.h> |
| 13 | #include <asm/bmips.h> | 13 | #include <asm/bmips.h> |
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index 2be9caaa2085..e28ee9a7cc7e 100644 --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 12 | #include <linux/bootmem.h> | 12 | #include <linux/memblock.h> |
| 13 | #include <linux/ioport.h> | 13 | #include <linux/ioport.h> |
| 14 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
| 15 | #include <asm/bootinfo.h> | 15 | #include <asm/bootinfo.h> |
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c index 6329c5f780d6..1738a06396f9 100644 --- a/arch/mips/bmips/setup.c +++ b/arch/mips/bmips/setup.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/bitops.h> | 11 | #include <linux/bitops.h> |
| 12 | #include <linux/bootmem.h> | 12 | #include <linux/memblock.h> |
| 13 | #include <linux/clk-provider.h> | 13 | #include <linux/clk-provider.h> |
| 14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c index c44c1a654471..e8eb60ed99f2 100644 --- a/arch/mips/cavium-octeon/dma-octeon.c +++ b/arch/mips/cavium-octeon/dma-octeon.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Copyright (C) 2010 Cavium Networks, Inc. | 11 | * Copyright (C) 2010 Cavium Networks, Inc. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/dma-direct.h> | 13 | #include <linux/dma-direct.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/swiotlb.h> | 15 | #include <linux/swiotlb.h> |
| 16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index a2acc6454cf3..5073d2ed78bb 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | 13 | ||
| 14 | #include <asm/addrspace.h> | 14 | #include <asm/addrspace.h> |
diff --git a/arch/mips/emma/common/prom.c b/arch/mips/emma/common/prom.c index cae42259d6da..675337b8a4a0 100644 --- a/arch/mips/emma/common/prom.c +++ b/arch/mips/emma/common/prom.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/memblock.h> |
| 26 | 26 | ||
| 27 | #include <asm/addrspace.h> | 27 | #include <asm/addrspace.h> |
| 28 | #include <asm/bootinfo.h> | 28 | #include <asm/bootinfo.h> |
diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c index dd9496f26e6a..429b7f8d2aeb 100644 --- a/arch/mips/fw/arc/memory.c +++ b/arch/mips/fw/arc/memory.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/swap.h> | 21 | #include <linux/swap.h> |
| 22 | 22 | ||
| 23 | #include <asm/sgialib.h> | 23 | #include <asm/sgialib.h> |
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index 0a0aaf39fd16..4c41ed0a637e 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/export.h> | 13 | #include <linux/export.h> |
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 18 | #include <linux/gfp.h> | 18 | #include <linux/gfp.h> |
| 19 | #include <linux/dma-direct.h> | 19 | #include <linux/dma-direct.h> |
diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c index 2c7288041a99..81845ba04835 100644 --- a/arch/mips/kernel/crash.c +++ b/arch/mips/kernel/crash.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include <linux/smp.h> | 3 | #include <linux/smp.h> |
| 4 | #include <linux/reboot.h> | 4 | #include <linux/reboot.h> |
| 5 | #include <linux/kexec.h> | 5 | #include <linux/kexec.h> |
| 6 | #include <linux/bootmem.h> | 6 | #include <linux/memblock.h> |
| 7 | #include <linux/crash_dump.h> | 7 | #include <linux/crash_dump.h> |
| 8 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
| 9 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
diff --git a/arch/mips/kernel/crash_dump.c b/arch/mips/kernel/crash_dump.c index a8657d29c62e..01b2bd95ba1f 100644 --- a/arch/mips/kernel/crash_dump.c +++ b/arch/mips/kernel/crash_dump.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | #include <linux/highmem.h> | 2 | #include <linux/highmem.h> |
| 3 | #include <linux/bootmem.h> | 3 | #include <linux/memblock.h> |
| 4 | #include <linux/crash_dump.h> | 4 | #include <linux/crash_dump.h> |
| 5 | #include <linux/uaccess.h> | 5 | #include <linux/uaccess.h> |
| 6 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 89950b7bf536..93b8e0b4332f 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/export.h> | 12 | #include <linux/export.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/bootmem.h> | 15 | #include <linux/memblock.h> |
| 16 | #include <linux/debugfs.h> | 16 | #include <linux/debugfs.h> |
| 17 | #include <linux/of.h> | 17 | #include <linux/of.h> |
| 18 | #include <linux/of_fdt.h> | 18 | #include <linux/of_fdt.h> |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 31522d3bc8bf..41c1683761bb 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/export.h> | 15 | #include <linux/export.h> |
| 16 | #include <linux/screen_info.h> | 16 | #include <linux/screen_info.h> |
| 17 | #include <linux/memblock.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <linux/bootmem.h> | ||
| 19 | #include <linux/initrd.h> | 18 | #include <linux/initrd.h> |
| 20 | #include <linux/root_dev.h> | 19 | #include <linux/root_dev.h> |
| 21 | #include <linux/highmem.h> | 20 | #include <linux/highmem.h> |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 623dc18f7f2f..0f852e1b5891 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/smp.h> | 28 | #include <linux/smp.h> |
| 29 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 30 | #include <linux/kallsyms.h> | 30 | #include <linux/kallsyms.h> |
| 31 | #include <linux/bootmem.h> | ||
| 32 | #include <linux/memblock.h> | 31 | #include <linux/memblock.h> |
| 33 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 34 | #include <linux/ptrace.h> | 33 | #include <linux/ptrace.h> |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 0bef238d2c0c..6176b9acba95 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/moduleloader.h> | 26 | #include <linux/moduleloader.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/poll.h> | 28 | #include <linux/poll.h> |
| 29 | #include <linux/bootmem.h> | 29 | #include <linux/memblock.h> |
| 30 | #include <asm/mipsregs.h> | 30 | #include <asm/mipsregs.h> |
| 31 | #include <asm/mipsmtregs.h> | 31 | #include <asm/mipsmtregs.h> |
| 32 | #include <asm/cacheflush.h> | 32 | #include <asm/cacheflush.h> |
diff --git a/arch/mips/kvm/commpage.c b/arch/mips/kvm/commpage.c index f43629979a0e..5812e6145801 100644 --- a/arch/mips/kvm/commpage.c +++ b/arch/mips/kvm/commpage.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 15 | #include <linux/vmalloc.h> | 15 | #include <linux/vmalloc.h> |
| 16 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
| 19 | #include <asm/cacheflush.h> | 19 | #include <asm/cacheflush.h> |
| 20 | #include <asm/mmu_context.h> | 20 | #include <asm/mmu_context.h> |
diff --git a/arch/mips/kvm/dyntrans.c b/arch/mips/kvm/dyntrans.c index f8e772564d74..d77b61b3d6ee 100644 --- a/arch/mips/kvm/dyntrans.c +++ b/arch/mips/kvm/dyntrans.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/uaccess.h> | 16 | #include <linux/uaccess.h> |
| 17 | #include <linux/vmalloc.h> | 17 | #include <linux/vmalloc.h> |
| 18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
| 21 | 21 | ||
| 22 | #include "commpage.h" | 22 | #include "commpage.h" |
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c index 4144bfaef137..ec9ed23bca7f 100644 --- a/arch/mips/kvm/emulate.c +++ b/arch/mips/kvm/emulate.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/kvm_host.h> | 15 | #include <linux/kvm_host.h> |
| 16 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/bootmem.h> | 18 | #include <linux/memblock.h> |
| 19 | #include <linux/random.h> | 19 | #include <linux/random.h> |
| 20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
| 21 | #include <asm/cacheflush.h> | 21 | #include <asm/cacheflush.h> |
diff --git a/arch/mips/kvm/interrupt.c b/arch/mips/kvm/interrupt.c index aa0a1a00faf6..7257e8b6f5a9 100644 --- a/arch/mips/kvm/interrupt.c +++ b/arch/mips/kvm/interrupt.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
| 14 | #include <linux/vmalloc.h> | 14 | #include <linux/vmalloc.h> |
| 15 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <asm/page.h> | 17 | #include <asm/page.h> |
| 18 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
| 19 | 19 | ||
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index f7ea8e21656b..1fcc4d149054 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
| 19 | #include <linux/sched/signal.h> | 19 | #include <linux/sched/signal.h> |
| 20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | 22 | ||
| 23 | #include <asm/fpu.h> | 23 | #include <asm/fpu.h> |
| 24 | #include <asm/page.h> | 24 | #include <asm/page.h> |
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index d984bd5c2ec5..14d4c5e2b42f 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/export.h> | 9 | #include <linux/export.h> |
| 10 | #include <linux/clk.h> | 10 | #include <linux/clk.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/of_fdt.h> | 12 | #include <linux/of_fdt.h> |
| 13 | 13 | ||
| 14 | #include <asm/bootinfo.h> | 14 | #include <asm/bootinfo.h> |
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c index 37b8fc5b9ac9..5ce1407de2d5 100644 --- a/arch/mips/lasat/prom.c +++ b/arch/mips/lasat/prom.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <linux/ctype.h> | 8 | #include <linux/ctype.h> |
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <asm/bootinfo.h> | 13 | #include <asm/bootinfo.h> |
| 14 | #include <asm/lasat/lasat.h> | 14 | #include <asm/lasat/lasat.h> |
diff --git a/arch/mips/loongson64/common/init.c b/arch/mips/loongson64/common/init.c index 6ef17120722f..c073fbcb9805 100644 --- a/arch/mips/loongson64/common/init.c +++ b/arch/mips/loongson64/common/init.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * option) any later version. | 8 | * option) any later version. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <asm/bootinfo.h> | 12 | #include <asm/bootinfo.h> |
| 13 | #include <asm/traps.h> | 13 | #include <asm/traps.h> |
| 14 | #include <asm/smp-ops.h> | 14 | #include <asm/smp-ops.h> |
diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c index 703ad4536fe0..622761878cd1 100644 --- a/arch/mips/loongson64/loongson-3/numa.c +++ b/arch/mips/loongson64/loongson-3/numa.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/nodemask.h> | 18 | #include <linux/nodemask.h> |
| 19 | #include <linux/swap.h> | 19 | #include <linux/swap.h> |
| 20 | #include <linux/memblock.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/bootmem.h> | ||
| 22 | #include <linux/pfn.h> | 21 | #include <linux/pfn.h> |
| 23 | #include <linux/highmem.h> | 22 | #include <linux/highmem.h> |
| 24 | #include <asm/page.h> | 23 | #include <asm/page.h> |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 0893b6136498..b521d8e2d359 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/ptrace.h> | 22 | #include <linux/ptrace.h> |
| 23 | #include <linux/mman.h> | 23 | #include <linux/mman.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/memblock.h> |
| 26 | #include <linux/highmem.h> | 26 | #include <linux/highmem.h> |
| 27 | #include <linux/swap.h> | 27 | #include <linux/swap.h> |
| 28 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c index b19a3c506b1e..e2a33adc0f29 100644 --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/highmem.h> | 11 | #include <linux/highmem.h> |
| 12 | #include <asm/fixmap.h> | 12 | #include <asm/fixmap.h> |
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c index a47556723b85..868921adef1d 100644 --- a/arch/mips/mti-malta/malta-memory.c +++ b/arch/mips/mti-malta/malta-memory.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | * Steven J. Hill <sjhill@mips.com> | 12 | * Steven J. Hill <sjhill@mips.com> |
| 13 | */ | 13 | */ |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/bootmem.h> | 15 | #include <linux/memblock.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | 17 | ||
| 18 | #include <asm/bootinfo.h> | 18 | #include <asm/bootinfo.h> |
diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c index b5ba83f4c646..c856f2a3ea42 100644 --- a/arch/mips/netlogic/xlp/dt.c +++ b/arch/mips/netlogic/xlp/dt.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/bootmem.h> | 36 | #include <linux/memblock.h> |
| 37 | 37 | ||
| 38 | #include <linux/of_fdt.h> | 38 | #include <linux/of_fdt.h> |
| 39 | #include <linux/of_platform.h> | 39 | #include <linux/of_platform.h> |
diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index 3c3b1e6abb53..687513880fbf 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/bug.h> | 11 | #include <linux/bug.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/export.h> | 15 | #include <linux/export.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index c2e94cf5ecda..e68b44b27c0d 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/bug.h> | 11 | #include <linux/bug.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/export.h> | 15 | #include <linux/export.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c index 1ada8492733b..d544e7b07f7a 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/sizes.h> | 14 | #include <linux/sizes.h> |
| 15 | #include <linux/of_fdt.h> | 15 | #include <linux/of_fdt.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <linux/of_platform.h> | 18 | #include <linux/of_platform.h> |
| 19 | #include <linux/of_address.h> | 19 | #include <linux/of_address.h> |
| 20 | 20 | ||
diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c index 6484e4a4597b..361a690facbf 100644 --- a/arch/mips/rb532/prom.c +++ b/arch/mips/rb532/prom.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/console.h> | 31 | #include <linux/console.h> |
| 32 | #include <linux/bootmem.h> | 32 | #include <linux/memblock.h> |
| 33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 34 | #include <linux/blkdev.h> | 34 | #include <linux/blkdev.h> |
| 35 | 35 | ||
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index cb1f1a6a166d..d8b8444d6795 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/export.h> | 18 | #include <linux/export.h> |
| 19 | #include <linux/nodemask.h> | 19 | #include <linux/nodemask.h> |
| 20 | #include <linux/swap.h> | 20 | #include <linux/swap.h> |
| 21 | #include <linux/bootmem.h> | ||
| 22 | #include <linux/pfn.h> | 21 | #include <linux/pfn.h> |
| 23 | #include <linux/highmem.h> | 22 | #include <linux/highmem.h> |
| 24 | #include <asm/page.h> | 23 | #include <asm/page.h> |
diff --git a/arch/mips/sibyte/common/cfe.c b/arch/mips/sibyte/common/cfe.c index 092fb2a6ec4a..12a780f251e1 100644 --- a/arch/mips/sibyte/common/cfe.c +++ b/arch/mips/sibyte/common/cfe.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/linkage.h> | 21 | #include <linux/linkage.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/blkdev.h> | 23 | #include <linux/blkdev.h> |
| 24 | #include <linux/bootmem.h> | 24 | #include <linux/memblock.h> |
| 25 | #include <linux/pm.h> | 25 | #include <linux/pm.h> |
| 26 | #include <linux/smp.h> | 26 | #include <linux/smp.h> |
| 27 | 27 | ||
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 152ca71cc2d7..3b034b7178d6 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/blkdev.h> | 27 | #include <linux/blkdev.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c index bcb469247e8c..2b36a2ee744c 100644 --- a/arch/mips/txx9/rbtx4938/prom.c +++ b/arch/mips/txx9/rbtx4938/prom.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <asm/bootinfo.h> | 15 | #include <asm/bootinfo.h> |
| 16 | #include <asm/txx9/generic.h> | 16 | #include <asm/txx9/generic.h> |
| 17 | #include <asm/txx9/rbtx4938.h> | 17 | #include <asm/txx9/rbtx4938.h> |
diff --git a/arch/nds32/kernel/setup.c b/arch/nds32/kernel/setup.c index 63a1a5ef5219..eacc79024879 100644 --- a/arch/nds32/kernel/setup.c +++ b/arch/nds32/kernel/setup.c | |||
| @@ -2,9 +2,8 @@ | |||
| 2 | // Copyright (C) 2005-2017 Andes Technology Corporation | 2 | // Copyright (C) 2005-2017 Andes Technology Corporation |
| 3 | 3 | ||
| 4 | #include <linux/cpu.h> | 4 | #include <linux/cpu.h> |
| 5 | #include <linux/bootmem.h> | ||
| 6 | #include <linux/seq_file.h> | ||
| 7 | #include <linux/memblock.h> | 5 | #include <linux/memblock.h> |
| 6 | #include <linux/seq_file.h> | ||
| 8 | #include <linux/console.h> | 7 | #include <linux/console.h> |
| 9 | #include <linux/screen_info.h> | 8 | #include <linux/screen_info.h> |
| 10 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
diff --git a/arch/nds32/mm/highmem.c b/arch/nds32/mm/highmem.c index e17cb8a69315..022779af6148 100644 --- a/arch/nds32/mm/highmem.c +++ b/arch/nds32/mm/highmem.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 7 | #include <linux/smp.h> | 7 | #include <linux/smp.h> |
| 8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/memblock.h> |
| 10 | #include <asm/fixmap.h> | 10 | #include <asm/fixmap.h> |
| 11 | #include <asm/tlbflush.h> | 11 | #include <asm/tlbflush.h> |
| 12 | 12 | ||
diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c index 66d3e9cf498d..131104bd2538 100644 --- a/arch/nds32/mm/init.c +++ b/arch/nds32/mm/init.c | |||
| @@ -7,12 +7,11 @@ | |||
| 7 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| 8 | #include <linux/swap.h> | 8 | #include <linux/swap.h> |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/bootmem.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/mman.h> | 11 | #include <linux/mman.h> |
| 12 | #include <linux/nodemask.h> | 12 | #include <linux/nodemask.h> |
| 13 | #include <linux/initrd.h> | 13 | #include <linux/initrd.h> |
| 14 | #include <linux/highmem.h> | 14 | #include <linux/highmem.h> |
| 15 | #include <linux/memblock.h> | ||
| 16 | 15 | ||
| 17 | #include <asm/sections.h> | 16 | #include <asm/sections.h> |
| 18 | #include <asm/setup.h> | 17 | #include <asm/setup.h> |
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index a6d4f7530247..232a36b511aa 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/bootmem.h> | 28 | #include <linux/memblock.h> |
| 29 | #include <linux/of.h> | 29 | #include <linux/of.h> |
| 30 | #include <linux/of_fdt.h> | 30 | #include <linux/of_fdt.h> |
| 31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 2d0011ddd4d5..6bbd4ae2beb0 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/sched/task.h> | 17 | #include <linux/sched/task.h> |
| 18 | #include <linux/console.h> | 18 | #include <linux/console.h> |
| 19 | #include <linux/bootmem.h> | ||
| 20 | #include <linux/memblock.h> | 19 | #include <linux/memblock.h> |
| 21 | #include <linux/initrd.h> | 20 | #include <linux/initrd.h> |
| 22 | #include <linux/of_fdt.h> | 21 | #include <linux/of_fdt.h> |
diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c index 12923501d94f..16cea5776b87 100644 --- a/arch/nios2/mm/init.c +++ b/arch/nios2/mm/init.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/pagemap.h> | 25 | #include <linux/pagemap.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 28 | #include <linux/binfmts.h> | 28 | #include <linux/binfmts.h> |
| 29 | 29 | ||
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index e17fcd83120f..c605bdad1746 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c | |||
| @@ -30,13 +30,12 @@ | |||
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/console.h> | 31 | #include <linux/console.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/bootmem.h> | 33 | #include <linux/memblock.h> |
| 34 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
| 35 | #include <linux/serial.h> | 35 | #include <linux/serial.h> |
| 36 | #include <linux/initrd.h> | 36 | #include <linux/initrd.h> |
| 37 | #include <linux/of_fdt.h> | 37 | #include <linux/of_fdt.h> |
| 38 | #include <linux/of.h> | 38 | #include <linux/of.h> |
| 39 | #include <linux/memblock.h> | ||
| 40 | #include <linux/device.h> | 39 | #include <linux/device.h> |
| 41 | 40 | ||
| 42 | #include <asm/sections.h> | 41 | #include <asm/sections.h> |
diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c index 91a6a9ab7598..d157310eb377 100644 --- a/arch/openrisc/mm/init.c +++ b/arch/openrisc/mm/init.c | |||
| @@ -26,12 +26,11 @@ | |||
| 26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 27 | #include <linux/swap.h> | 27 | #include <linux/swap.h> |
| 28 | #include <linux/smp.h> | 28 | #include <linux/smp.h> |
| 29 | #include <linux/bootmem.h> | 29 | #include <linux/memblock.h> |
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/blkdev.h> /* for initrd_* */ | 32 | #include <linux/blkdev.h> /* for initrd_* */ |
| 33 | #include <linux/pagemap.h> | 33 | #include <linux/pagemap.h> |
| 34 | #include <linux/memblock.h> | ||
| 35 | 34 | ||
| 36 | #include <asm/segment.h> | 35 | #include <asm/segment.h> |
| 37 | #include <asm/pgalloc.h> | 36 | #include <asm/pgalloc.h> |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 7e7a3126c5e9..2d7cffcaa476 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/bootmem.h> | ||
| 18 | #include <linux/memblock.h> | 17 | #include <linux/memblock.h> |
| 19 | #include <linux/gfp.h> | 18 | #include <linux/gfp.h> |
| 20 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index d39ec3a4550a..274bd1442dd9 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <linux/capability.h> | 10 | #include <linux/capability.h> |
| 11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/bootmem.h> | 13 | #include <linux/memblock.h> |
| 14 | #include <linux/syscalls.h> | 14 | #include <linux/syscalls.h> |
| 15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 2b56d1f30387..93ee3703b42f 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/serial_8250.h> | 33 | #include <linux/serial_8250.h> |
| 34 | #include <linux/percpu.h> | 34 | #include <linux/percpu.h> |
| 35 | #include <linux/memblock.h> | 35 | #include <linux/memblock.h> |
| 36 | #include <linux/bootmem.h> | ||
| 37 | #include <linux/of_platform.h> | 36 | #include <linux/of_platform.h> |
| 38 | #include <linux/hugetlb.h> | 37 | #include <linux/hugetlb.h> |
| 39 | #include <asm/debugfs.h> | 38 | #include <asm/debugfs.h> |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 9216c3a7fcfc..2a51e4cc8246 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -29,10 +29,9 @@ | |||
| 29 | #include <linux/unistd.h> | 29 | #include <linux/unistd.h> |
| 30 | #include <linux/serial.h> | 30 | #include <linux/serial.h> |
| 31 | #include <linux/serial_8250.h> | 31 | #include <linux/serial_8250.h> |
| 32 | #include <linux/bootmem.h> | 32 | #include <linux/memblock.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/lockdep.h> | 34 | #include <linux/lockdep.h> |
| 35 | #include <linux/memblock.h> | ||
| 36 | #include <linux/memory.h> | 35 | #include <linux/memory.h> |
| 37 | #include <linux/nmi.h> | 36 | #include <linux/nmi.h> |
| 38 | 37 | ||
diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c index bf87d6e13369..5b61704447c1 100644 --- a/arch/powerpc/lib/alloc.c +++ b/arch/powerpc/lib/alloc.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #include <linux/types.h> | 2 | #include <linux/types.h> |
| 3 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| 4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
| 5 | #include <linux/bootmem.h> | 5 | #include <linux/memblock.h> |
| 6 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 7 | #include <asm/setup.h> | 7 | #include <asm/setup.h> |
| 8 | 8 | ||
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index a7226ed9cae6..8cf035e68378 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/export.h> | 15 | #include <linux/export.h> |
| 16 | #include <linux/of_fdt.h> | 16 | #include <linux/of_fdt.h> |
| 17 | #include <linux/memblock.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <linux/bootmem.h> | ||
| 19 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
| 20 | #include <linux/swap.h> | 19 | #include <linux/swap.h> |
| 21 | #include <linux/swapops.h> | 20 | #include <linux/swapops.h> |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index b3fe79064a69..0a64fffabee1 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
| @@ -27,12 +27,11 @@ | |||
| 27 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 28 | #include <linux/stddef.h> | 28 | #include <linux/stddef.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/bootmem.h> | 30 | #include <linux/memblock.h> |
| 31 | #include <linux/highmem.h> | 31 | #include <linux/highmem.h> |
| 32 | #include <linux/initrd.h> | 32 | #include <linux/initrd.h> |
| 33 | #include <linux/pagemap.h> | 33 | #include <linux/pagemap.h> |
| 34 | #include <linux/suspend.h> | 34 | #include <linux/suspend.h> |
| 35 | #include <linux/memblock.h> | ||
| 36 | #include <linux/hugetlb.h> | 35 | #include <linux/hugetlb.h> |
| 37 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 38 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c index 954f1986af4d..67b9d7b669a1 100644 --- a/arch/powerpc/mm/mmu_context_nohash.c +++ b/arch/powerpc/mm/mmu_context_nohash.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <linux/mm.h> | 44 | #include <linux/mm.h> |
| 45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
| 46 | #include <linux/spinlock.h> | 46 | #include <linux/spinlock.h> |
| 47 | #include <linux/bootmem.h> | 47 | #include <linux/memblock.h> |
| 48 | #include <linux/notifier.h> | 48 | #include <linux/notifier.h> |
| 49 | #include <linux/cpu.h> | 49 | #include <linux/cpu.h> |
| 50 | #include <linux/slab.h> | 50 | #include <linux/slab.h> |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index f04f15f9d232..3a048e98a132 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #define pr_fmt(fmt) "numa: " fmt | 11 | #define pr_fmt(fmt) "numa: " fmt |
| 12 | 12 | ||
| 13 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/mmzone.h> | 17 | #include <linux/mmzone.h> |
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/nodemask.h> | 19 | #include <linux/nodemask.h> |
| 20 | #include <linux/cpu.h> | 20 | #include <linux/cpu.h> |
| 21 | #include <linux/notifier.h> | 21 | #include <linux/notifier.h> |
| 22 | #include <linux/memblock.h> | ||
| 23 | #include <linux/of.h> | 22 | #include <linux/of.h> |
| 24 | #include <linux/pfn.h> | 23 | #include <linux/pfn.h> |
| 25 | #include <linux/cpuset.h> | 24 | #include <linux/cpuset.h> |
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c index f45b369177a4..f3391be7c762 100644 --- a/arch/powerpc/platforms/powermac/nvram.c +++ b/arch/powerpc/platforms/powermac/nvram.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/adb.h> | 19 | #include <linux/adb.h> |
| 20 | #include <linux/pmu.h> | 20 | #include <linux/pmu.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/completion.h> | 22 | #include <linux/completion.h> |
| 23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
| 24 | #include <asm/sections.h> | 24 | #include <asm/sections.h> |
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 23a67b545b70..aba81cbf0b36 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c | |||
| @@ -17,11 +17,10 @@ | |||
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/msi.h> | 23 | #include <linux/msi.h> |
| 24 | #include <linux/memblock.h> | ||
| 25 | #include <linux/iommu.h> | 24 | #include <linux/iommu.h> |
| 26 | #include <linux/rculist.h> | 25 | #include <linux/rculist.h> |
| 27 | #include <linux/sizes.h> | 26 | #include <linux/sizes.h> |
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index 12519857a33c..658bfab3350b 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/root_dev.h> | 24 | #include <linux/root_dev.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
| 27 | #include <linux/bootmem.h> | 27 | #include <linux/memblock.h> |
| 28 | 28 | ||
| 29 | #include <asm/machdep.h> | 29 | #include <asm/machdep.h> |
| 30 | #include <asm/firmware.h> | 30 | #include <asm/firmware.h> |
diff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c index 349a9ff6ca5b..2444feda831f 100644 --- a/arch/powerpc/sysdev/msi_bitmap.c +++ b/arch/powerpc/sysdev/msi_bitmap.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/kmemleak.h> | 13 | #include <linux/kmemleak.h> |
| 14 | #include <linux/bitmap.h> | 14 | #include <linux/bitmap.h> |
| 15 | #include <linux/bootmem.h> | 15 | #include <linux/memblock.h> |
| 16 | #include <asm/msi_bitmap.h> | 16 | #include <asm/msi_bitmap.h> |
| 17 | #include <asm/setup.h> | 17 | #include <asm/setup.h> |
| 18 | 18 | ||
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index d58c111099b3..1d9bfaff60bc 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c | |||
| @@ -13,9 +13,8 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/bootmem.h> | ||
| 17 | #include <linux/initrd.h> | ||
| 18 | #include <linux/memblock.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/initrd.h> | ||
| 19 | #include <linux/swap.h> | 18 | #include <linux/swap.h> |
| 20 | #include <linux/sizes.h> | 19 | #include <linux/sizes.h> |
| 21 | 20 | ||
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index d17566a8c76f..97eae3871868 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c | |||
| @@ -13,10 +13,9 @@ | |||
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/gfp.h> | 14 | #include <linux/gfp.h> |
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/elf.h> | 17 | #include <linux/elf.h> |
| 18 | #include <asm/asm-offsets.h> | 18 | #include <asm/asm-offsets.h> |
| 19 | #include <linux/memblock.h> | ||
| 20 | #include <asm/os_info.h> | 19 | #include <asm/os_info.h> |
| 21 | #include <asm/elf.h> | 20 | #include <asm/elf.h> |
| 22 | #include <asm/ipl.h> | 21 | #include <asm/ipl.h> |
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 781c1053a773..72dd23ef771b 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/initrd.h> | 36 | #include <linux/initrd.h> |
| 37 | #include <linux/bootmem.h> | ||
| 38 | #include <linux/root_dev.h> | 37 | #include <linux/root_dev.h> |
| 39 | #include <linux/console.h> | 38 | #include <linux/console.h> |
| 40 | #include <linux/kernel_stat.h> | 39 | #include <linux/kernel_stat.h> |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 44f9a7d6450b..f82b3d3c36e2 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 20 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 21 | 21 | ||
| 22 | #include <linux/workqueue.h> | 22 | #include <linux/workqueue.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/export.h> | 24 | #include <linux/export.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/sched/hotplug.h> | 35 | #include <linux/sched/hotplug.h> |
| 36 | #include <linux/sched/task_stack.h> | 36 | #include <linux/sched/task_stack.h> |
| 37 | #include <linux/crash_dump.h> | 37 | #include <linux/crash_dump.h> |
| 38 | #include <linux/memblock.h> | ||
| 39 | #include <linux/kprobes.h> | 38 | #include <linux/kprobes.h> |
| 40 | #include <asm/asm-offsets.h> | 39 | #include <asm/asm-offsets.h> |
| 41 | #include <asm/diag.h> | 40 | #include <asm/diag.h> |
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 799a91882a76..8992b04c0ade 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 8 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 9 | 9 | ||
| 10 | #include <linux/workqueue.h> | 10 | #include <linux/workqueue.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/uaccess.h> | 12 | #include <linux/uaccess.h> |
| 13 | #include <linux/sysctl.h> | 13 | #include <linux/sysctl.h> |
| 14 | #include <linux/cpuset.h> | 14 | #include <linux/cpuset.h> |
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index ec31b48a42a5..ebe748a9f472 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/user.h> | 18 | #include <linux/user.h> |
| 19 | #include <linux/elf.h> | 19 | #include <linux/elf.h> |
| 20 | #include <linux/security.h> | 20 | #include <linux/security.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/compat.h> | 22 | #include <linux/compat.h> |
| 23 | #include <asm/asm-offsets.h> | 23 | #include <asm/asm-offsets.h> |
| 24 | #include <asm/pgtable.h> | 24 | #include <asm/pgtable.h> |
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c index 84111a43ea29..eba2def3414d 100644 --- a/arch/s390/mm/extmem.c +++ b/arch/s390/mm/extmem.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <linux/export.h> | 18 | #include <linux/export.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/ctype.h> | 20 | #include <linux/ctype.h> |
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <asm/diag.h> | 22 | #include <asm/diag.h> |
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 873f6ee1c46d..76d0708438e9 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/pagemap.h> | 23 | #include <linux/pagemap.h> |
| 24 | #include <linux/bootmem.h> | 24 | #include <linux/memblock.h> |
| 25 | #include <linux/memory.h> | 25 | #include <linux/memory.h> |
| 26 | #include <linux/pfn.h> | 26 | #include <linux/pfn.h> |
| 27 | #include <linux/poison.h> | 27 | #include <linux/poison.h> |
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
| 30 | #include <linux/cma.h> | 30 | #include <linux/cma.h> |
| 31 | #include <linux/gfp.h> | 31 | #include <linux/gfp.h> |
| 32 | #include <linux/memblock.h> | ||
| 33 | #include <asm/processor.h> | 32 | #include <asm/processor.h> |
| 34 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
| 35 | #include <asm/pgtable.h> | 34 | #include <asm/pgtable.h> |
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 04638b0b9ef1..0472e27febdf 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
| @@ -4,14 +4,13 @@ | |||
| 4 | * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> | 4 | * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/bootmem.h> | 7 | #include <linux/memblock.h> |
| 8 | #include <linux/pfn.h> | 8 | #include <linux/pfn.h> |
| 9 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
| 12 | #include <linux/hugetlb.h> | 12 | #include <linux/hugetlb.h> |
| 13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 14 | #include <linux/memblock.h> | ||
| 15 | #include <asm/cacheflush.h> | 14 | #include <asm/cacheflush.h> |
| 16 | #include <asm/pgalloc.h> | 15 | #include <asm/pgalloc.h> |
| 17 | #include <asm/pgtable.h> | 16 | #include <asm/pgtable.h> |
diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c index 5a381fc8e958..bfba273c32c0 100644 --- a/arch/s390/numa/mode_emu.c +++ b/arch/s390/numa/mode_emu.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/cpumask.h> | 23 | #include <linux/cpumask.h> |
| 24 | #include <linux/memblock.h> | 24 | #include <linux/memblock.h> |
| 25 | #include <linux/bootmem.h> | ||
| 26 | #include <linux/node.h> | 25 | #include <linux/node.h> |
| 27 | #include <linux/memory.h> | 26 | #include <linux/memory.h> |
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c index 297f5d8b0890..ae0d9e889534 100644 --- a/arch/s390/numa/numa.c +++ b/arch/s390/numa/numa.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/mmzone.h> | 14 | #include <linux/mmzone.h> |
| 15 | #include <linux/cpumask.h> | 15 | #include <linux/cpumask.h> |
| 16 | #include <linux/bootmem.h> | ||
| 17 | #include <linux/memblock.h> | 16 | #include <linux/memblock.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 19 | #include <linux/node.h> | 18 | #include <linux/node.h> |
diff --git a/arch/s390/numa/toptree.c b/arch/s390/numa/toptree.c index 7f61cc3fd4d1..71a608cd4f61 100644 --- a/arch/s390/numa/toptree.c +++ b/arch/s390/numa/toptree.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
| 13 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 14 | #include <linux/list_sort.h> | 14 | #include <linux/list_sort.h> |
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 21447f866415..c8c13c777162 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
| @@ -11,12 +11,11 @@ | |||
| 11 | #include <linux/swap.h> | 11 | #include <linux/swap.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/gfp.h> | 13 | #include <linux/gfp.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/proc_fs.h> | 15 | #include <linux/proc_fs.h> |
| 16 | #include <linux/pagemap.h> | 16 | #include <linux/pagemap.h> |
| 17 | #include <linux/percpu.h> | 17 | #include <linux/percpu.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/memblock.h> | ||
| 20 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
| 21 | #include <linux/export.h> | 20 | #include <linux/export.h> |
| 22 | #include <asm/mmu_context.h> | 21 | #include <asm/mmu_context.h> |
diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c index 927a1294c465..07e744d75fa0 100644 --- a/arch/sh/mm/ioremap_fixed.c +++ b/arch/sh/mm/ioremap_fixed.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/memblock.h> |
| 18 | #include <linux/proc_fs.h> | 18 | #include <linux/proc_fs.h> |
| 19 | #include <asm/fixmap.h> | 19 | #include <asm/fixmap.h> |
| 20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c index a41526bd91e2..9a26b442f820 100644 --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c | |||
| @@ -5,13 +5,11 @@ | |||
| 5 | */ | 5 | */ |
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/memblock.h> | ||
| 9 | #include <linux/log2.h> | 8 | #include <linux/log2.h> |
| 10 | #include <linux/list.h> | 9 | #include <linux/list.h> |
| 11 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/miscdevice.h> | 12 | #include <linux/miscdevice.h> |
| 14 | #include <linux/bootmem.h> | ||
| 15 | #include <linux/memblock.h> | 13 | #include <linux/memblock.h> |
| 16 | #include <linux/export.h> | 14 | #include <linux/export.h> |
| 17 | #include <linux/refcount.h> | 15 | #include <linux/refcount.h> |
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c index 4389944735c6..d41e2a749c5d 100644 --- a/arch/sparc/kernel/prom_32.c +++ b/arch/sparc/kernel/prom_32.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | 23 | ||
| 24 | #include <asm/prom.h> | 24 | #include <asm/prom.h> |
| 25 | #include <asm/oplib.h> | 25 | #include <asm/oplib.h> |
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index de7c87b153fe..cd2825cb8420 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <linux/initrd.h> | 32 | #include <linux/initrd.h> |
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/start_kernel.h> | 34 | #include <linux/start_kernel.h> |
| 35 | #include <linux/bootmem.h> | 35 | #include <linux/memblock.h> |
| 36 | 36 | ||
| 37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 38 | #include <asm/processor.h> | 38 | #include <asm/processor.h> |
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index 6cc80d0f4b9f..4792e08ad36b 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/cache.h> | 22 | #include <linux/cache.h> |
| 23 | #include <linux/jiffies.h> | 23 | #include <linux/jiffies.h> |
| 24 | #include <linux/profile.h> | 24 | #include <linux/profile.h> |
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/memblock.h> |
| 26 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 27 | #include <linux/ftrace.h> | 27 | #include <linux/ftrace.h> |
| 28 | #include <linux/cpu.h> | 28 | #include <linux/cpu.h> |
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 880714565c40..d900952bfc5f 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/initrd.h> | 22 | #include <linux/initrd.h> |
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/highmem.h> | 24 | #include <linux/highmem.h> |
| 25 | #include <linux/bootmem.h> | ||
| 26 | #include <linux/memblock.h> | 25 | #include <linux/memblock.h> |
| 27 | #include <linux/pagemap.h> | 26 | #include <linux/pagemap.h> |
| 28 | #include <linux/poison.h> | 27 | #include <linux/poison.h> |
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index a8c3453195e6..3c8aac21f426 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/hugetlb.h> | 16 | #include <linux/hugetlb.h> |
| 17 | #include <linux/initrd.h> | 17 | #include <linux/initrd.h> |
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/sort.h> | 25 | #include <linux/sort.h> |
| 26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
| 27 | #include <linux/percpu.h> | 27 | #include <linux/percpu.h> |
| 28 | #include <linux/memblock.h> | ||
| 29 | #include <linux/mmzone.h> | 28 | #include <linux/mmzone.h> |
| 30 | #include <linux/gfp.h> | 29 | #include <linux/gfp.h> |
| 31 | 30 | ||
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index b48fea5ad9ef..a6142c5abf61 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/seq_file.h> | 12 | #include <linux/seq_file.h> |
| 13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/pagemap.h> | 15 | #include <linux/pagemap.h> |
| 16 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
| 17 | #include <linux/kdebug.h> | 17 | #include <linux/kdebug.h> |
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index ef19a391214f..673816880cce 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Licensed under the GPL. | 6 | * Licensed under the GPL. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/memblock.h> |
| 10 | #include <linux/etherdevice.h> | 10 | #include <linux/etherdevice.h> |
| 11 | #include <linux/ethtool.h> | 11 | #include <linux/ethtool.h> |
| 12 | #include <linux/inetdevice.h> | 12 | #include <linux/inetdevice.h> |
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index 20442d20bd09..2b4dded11a7a 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/version.h> | 11 | #include <linux/version.h> |
| 12 | #include <linux/bootmem.h> | 12 | #include <linux/memblock.h> |
| 13 | #include <linux/etherdevice.h> | 13 | #include <linux/etherdevice.h> |
| 14 | #include <linux/ethtool.h> | 14 | #include <linux/ethtool.h> |
| 15 | #include <linux/inetdevice.h> | 15 | #include <linux/inetdevice.h> |
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index 844056cf313e..3678f5b05e42 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/bootmem.h> | 7 | #include <linux/memblock.h> |
| 8 | #include <linux/initrd.h> | 8 | #include <linux/initrd.h> |
| 9 | #include <asm/types.h> | 9 | #include <asm/types.h> |
| 10 | #include <init.h> | 10 | #include <init.h> |
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 2c672a8f4571..1067469ba2ea 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/stddef.h> | 6 | #include <linux/stddef.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/bootmem.h> | ||
| 9 | #include <linux/memblock.h> | 8 | #include <linux/memblock.h> |
| 10 | #include <linux/highmem.h> | 9 | #include <linux/highmem.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 296a91a04598..5bf56af4d5b9 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 7 | #include <linux/bootmem.h> | ||
| 8 | #include <linux/memblock.h> | 7 | #include <linux/memblock.h> |
| 9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 10 | #include <linux/pfn.h> | 9 | #include <linux/pfn.h> |
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c index 9969ec374abb..29b71c68eb7c 100644 --- a/arch/unicore32/kernel/hibernate.c +++ b/arch/unicore32/kernel/hibernate.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/gfp.h> | 14 | #include <linux/gfp.h> |
| 15 | #include <linux/suspend.h> | 15 | #include <linux/suspend.h> |
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | 17 | ||
| 18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
| 19 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c index 9f163f976315..b2c38b32ea57 100644 --- a/arch/unicore32/kernel/setup.c +++ b/arch/unicore32/kernel/setup.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/utsname.h> | 17 | #include <linux/utsname.h> |
| 18 | #include <linux/initrd.h> | 18 | #include <linux/initrd.h> |
| 19 | #include <linux/console.h> | 19 | #include <linux/console.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
| 22 | #include <linux/screen_info.h> | 22 | #include <linux/screen_info.h> |
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/smp.h> | 27 | #include <linux/smp.h> |
| 28 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
| 29 | #include <linux/proc_fs.h> | 29 | #include <linux/proc_fs.h> |
| 30 | #include <linux/memblock.h> | ||
| 31 | #include <linux/elf.h> | 30 | #include <linux/elf.h> |
| 32 | #include <linux/io.h> | 31 | #include <linux/io.h> |
| 33 | 32 | ||
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c index 44fd0e8fbe87..cf4eb9481fd6 100644 --- a/arch/unicore32/mm/init.c +++ b/arch/unicore32/mm/init.c | |||
| @@ -11,13 +11,12 @@ | |||
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 12 | #include <linux/swap.h> | 12 | #include <linux/swap.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/mman.h> | 15 | #include <linux/mman.h> |
| 16 | #include <linux/nodemask.h> | 16 | #include <linux/nodemask.h> |
| 17 | #include <linux/initrd.h> | 17 | #include <linux/initrd.h> |
| 18 | #include <linux/highmem.h> | 18 | #include <linux/highmem.h> |
| 19 | #include <linux/gfp.h> | 19 | #include <linux/gfp.h> |
| 20 | #include <linux/memblock.h> | ||
| 21 | #include <linux/sort.h> | 20 | #include <linux/sort.h> |
| 22 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 23 | #include <linux/export.h> | 22 | #include <linux/export.h> |
diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c index 18b355a20f0b..040a8c279761 100644 --- a/arch/unicore32/mm/mmu.c +++ b/arch/unicore32/mm/mmu.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/nodemask.h> | 17 | #include <linux/nodemask.h> |
| 18 | #include <linux/memblock.h> | 18 | #include <linux/memblock.h> |
| 19 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 20 | #include <linux/bootmem.h> | ||
| 21 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 22 | 21 | ||
| 23 | #include <asm/cputype.h> | 22 | #include <asm/cputype.h> |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index f5ea6415b778..7f5d212551d4 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <linux/dmi.h> | 32 | #include <linux/dmi.h> |
| 33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/bootmem.h> | 35 | #include <linux/memblock.h> |
| 36 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
| 37 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
| 38 | #include <linux/efi-bgrt.h> | 38 | #include <linux/efi-bgrt.h> |
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index f1915b744052..ca13851f0570 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/acpi.h> | 9 | #include <linux/acpi.h> |
| 10 | #include <linux/bootmem.h> | ||
| 11 | #include <linux/memblock.h> | 10 | #include <linux/memblock.h> |
| 12 | #include <linux/dmi.h> | 11 | #include <linux/dmi.h> |
| 13 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index ab731ab09f06..32b2b7a41ef5 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/acpi_pmtmr.h> | 20 | #include <linux/acpi_pmtmr.h> |
| 21 | #include <linux/clockchips.h> | 21 | #include <linux/clockchips.h> |
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/ftrace.h> | 24 | #include <linux/ftrace.h> |
| 25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 8c7450900e0e..5fbc57e4b0b9 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #include <linux/kthread.h> | 47 | #include <linux/kthread.h> |
| 48 | #include <linux/jiffies.h> /* time_after() */ | 48 | #include <linux/jiffies.h> /* time_after() */ |
| 49 | #include <linux/slab.h> | 49 | #include <linux/slab.h> |
| 50 | #include <linux/bootmem.h> | 50 | #include <linux/memblock.h> |
| 51 | 51 | ||
| 52 | #include <asm/irqdomain.h> | 52 | #include <asm/irqdomain.h> |
| 53 | #include <asm/io.h> | 53 | #include <asm/io.h> |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 660d0b22e962..cbbd57ae06ee 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* cpu_feature_enabled() cannot be used this early */ | 1 | /* cpu_feature_enabled() cannot be used this early */ |
| 2 | #define USE_EARLY_PGTABLE_L5 | 2 | #define USE_EARLY_PGTABLE_L5 |
| 3 | 3 | ||
| 4 | #include <linux/bootmem.h> | 4 | #include <linux/memblock.h> |
| 5 | #include <linux/linkage.h> | 5 | #include <linux/linkage.h> |
| 6 | #include <linux/bitops.h> | 6 | #include <linux/bitops.h> |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index a0ec4c37265a..68ff62bffbab 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -9,11 +9,10 @@ | |||
| 9 | * allocation code routines via a platform independent interface (memblock, etc.). | 9 | * allocation code routines via a platform independent interface (memblock, etc.). |
| 10 | */ | 10 | */ |
| 11 | #include <linux/crash_dump.h> | 11 | #include <linux/crash_dump.h> |
| 12 | #include <linux/bootmem.h> | 12 | #include <linux/memblock.h> |
| 13 | #include <linux/suspend.h> | 13 | #include <linux/suspend.h> |
| 14 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 15 | #include <linux/firmware-map.h> | 15 | #include <linux/firmware-map.h> |
| 16 | #include <linux/memblock.h> | ||
| 17 | #include <linux/sort.h> | 16 | #include <linux/sort.h> |
| 18 | 17 | ||
| 19 | #include <asm/e820/api.h> | 18 | #include <asm/e820/api.h> |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index f1c5eb99d445..3482460d984d 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/bootmem.h> | ||
| 15 | #include <linux/memblock.h> | 14 | #include <linux/memblock.h> |
| 16 | #include <linux/kernel_stat.h> | 15 | #include <linux/kernel_stat.h> |
| 17 | #include <linux/mc146818rtc.h> | 16 | #include <linux/mc146818rtc.h> |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 7ba73fe0d917..f4562fcec681 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include <linux/dma-debug.h> | 3 | #include <linux/dma-debug.h> |
| 4 | #include <linux/dmar.h> | 4 | #include <linux/dmar.h> |
| 5 | #include <linux/export.h> | 5 | #include <linux/export.h> |
| 6 | #include <linux/bootmem.h> | 6 | #include <linux/memblock.h> |
| 7 | #include <linux/gfp.h> | 7 | #include <linux/gfp.h> |
| 8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 9 | 9 | ||
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index 71c0b01d93b1..bd08b9e1c9e2 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <linux/cache.h> | 5 | #include <linux/cache.h> |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/swiotlb.h> | 7 | #include <linux/swiotlb.h> |
| 8 | #include <linux/bootmem.h> | 8 | #include <linux/memblock.h> |
| 9 | #include <linux/dma-direct.h> | 9 | #include <linux/dma-direct.h> |
| 10 | #include <linux/mem_encrypt.h> | 10 | #include <linux/mem_encrypt.h> |
| 11 | 11 | ||
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 637982efecd8..9b158b4716d2 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/notifier.h> | 20 | #include <linux/notifier.h> |
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/gfp.h> | 22 | #include <linux/gfp.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/nmi.h> | 24 | #include <linux/nmi.h> |
| 25 | 25 | ||
| 26 | #include <asm/fixmap.h> | 26 | #include <asm/fixmap.h> |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 7005f89bf3b2..b74e7bfed6ab 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/sfi.h> | 30 | #include <linux/sfi.h> |
| 31 | #include <linux/apm_bios.h> | 31 | #include <linux/apm_bios.h> |
| 32 | #include <linux/initrd.h> | 32 | #include <linux/initrd.h> |
| 33 | #include <linux/bootmem.h> | ||
| 34 | #include <linux/memblock.h> | 33 | #include <linux/memblock.h> |
| 35 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
| 36 | #include <linux/console.h> | 35 | #include <linux/console.h> |
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 483412fb8a24..e8796fcd7e5a 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/export.h> | 5 | #include <linux/export.h> |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/bootmem.h> | ||
| 8 | #include <linux/memblock.h> | 7 | #include <linux/memblock.h> |
| 9 | #include <linux/percpu.h> | 8 | #include <linux/percpu.h> |
| 10 | #include <linux/kexec.h> | 9 | #include <linux/kexec.h> |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 5369d7fac797..a9134d1910b9 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | #include <linux/sched/hotplug.h> | 49 | #include <linux/sched/hotplug.h> |
| 50 | #include <linux/sched/task_stack.h> | 50 | #include <linux/sched/task_stack.h> |
| 51 | #include <linux/percpu.h> | 51 | #include <linux/percpu.h> |
| 52 | #include <linux/bootmem.h> | 52 | #include <linux/memblock.h> |
| 53 | #include <linux/err.h> | 53 | #include <linux/err.h> |
| 54 | #include <linux/nmi.h> | 54 | #include <linux/nmi.h> |
| 55 | #include <linux/tboot.h> | 55 | #include <linux/tboot.h> |
diff --git a/arch/x86/kernel/tce_64.c b/arch/x86/kernel/tce_64.c index 75730ce01f8d..285aaa62d153 100644 --- a/arch/x86/kernel/tce_64.c +++ b/arch/x86/kernel/tce_64.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
| 33 | #include <linux/bootmem.h> | ||
| 34 | #include <linux/memblock.h> | 33 | #include <linux/memblock.h> |
| 35 | #include <asm/tce.h> | 34 | #include <asm/tce.h> |
| 36 | #include <asm/calgary.h> | 35 | #include <asm/calgary.h> |
diff --git a/arch/x86/mm/amdtopology.c b/arch/x86/mm/amdtopology.c index 048c761d97b0..058b2f36b3a6 100644 --- a/arch/x86/mm/amdtopology.c +++ b/arch/x86/mm/amdtopology.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 13 | #include <linux/nodemask.h> | 13 | #include <linux/nodemask.h> |
| 14 | #include <linux/memblock.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/bootmem.h> | ||
| 16 | 15 | ||
| 17 | #include <asm/io.h> | 16 | #include <asm/io.h> |
| 18 | #include <linux/pci_ids.h> | 17 | #include <linux/pci_ids.h> |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index b24eb4eb9984..71d4b9d4d43f 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <linux/sched/task_stack.h> /* task_stack_*(), ... */ | 8 | #include <linux/sched/task_stack.h> /* task_stack_*(), ... */ |
| 9 | #include <linux/kdebug.h> /* oops_begin/end, ... */ | 9 | #include <linux/kdebug.h> /* oops_begin/end, ... */ |
| 10 | #include <linux/extable.h> /* search_exception_tables */ | 10 | #include <linux/extable.h> /* search_exception_tables */ |
| 11 | #include <linux/bootmem.h> /* max_low_pfn */ | 11 | #include <linux/memblock.h> /* max_low_pfn */ |
| 12 | #include <linux/kprobes.h> /* NOKPROBE_SYMBOL, ... */ | 12 | #include <linux/kprobes.h> /* NOKPROBE_SYMBOL, ... */ |
| 13 | #include <linux/mmiotrace.h> /* kmmio_handler, ... */ | 13 | #include <linux/mmiotrace.h> /* kmmio_handler, ... */ |
| 14 | #include <linux/perf_event.h> /* perf_sw_event */ | 14 | #include <linux/perf_event.h> /* perf_sw_event */ |
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index 62915a5e0fa2..0d4bdcb84da5 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include <linux/highmem.h> | 1 | #include <linux/highmem.h> |
| 2 | #include <linux/export.h> | 2 | #include <linux/export.h> |
| 3 | #include <linux/swap.h> /* for totalram_pages */ | 3 | #include <linux/swap.h> /* for totalram_pages */ |
| 4 | #include <linux/bootmem.h> | 4 | #include <linux/memblock.h> |
| 5 | 5 | ||
| 6 | void *kmap(struct page *page) | 6 | void *kmap(struct page *page) |
| 7 | { | 7 | { |
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index faca978ebf9d..ef99f3892e1f 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #include <linux/ioport.h> | 3 | #include <linux/ioport.h> |
| 4 | #include <linux/swap.h> | 4 | #include <linux/swap.h> |
| 5 | #include <linux/memblock.h> | 5 | #include <linux/memblock.h> |
| 6 | #include <linux/bootmem.h> /* for max_low_pfn */ | ||
| 7 | #include <linux/swapfile.h> | 6 | #include <linux/swapfile.h> |
| 8 | #include <linux/swapops.h> | 7 | #include <linux/swapops.h> |
| 9 | 8 | ||
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 3bbe5f58a67d..49ecf5ecf6d3 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/pfn.h> | 24 | #include <linux/pfn.h> |
| 25 | #include <linux/poison.h> | 25 | #include <linux/poison.h> |
| 26 | #include <linux/bootmem.h> | ||
| 27 | #include <linux/memblock.h> | 26 | #include <linux/memblock.h> |
| 28 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
| 29 | #include <linux/memory_hotplug.h> | 28 | #include <linux/memory_hotplug.h> |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index bfb0bedc21d3..5fab264948c2 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/initrd.h> | 21 | #include <linux/initrd.h> |
| 22 | #include <linux/pagemap.h> | 22 | #include <linux/pagemap.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
| 26 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 24e0920a9b25..5378d10f1d31 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * (C) Copyright 1995 1996 Linus Torvalds | 6 | * (C) Copyright 1995 1996 Linus Torvalds |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/memblock.h> |
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/io.h> | 11 | #include <linux/io.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 8f87499124b8..04a9cf6b034f 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c | |||
| @@ -5,10 +5,9 @@ | |||
| 5 | /* cpu_feature_enabled() cannot be used this early */ | 5 | /* cpu_feature_enabled() cannot be used this early */ |
| 6 | #define USE_EARLY_PGTABLE_L5 | 6 | #define USE_EARLY_PGTABLE_L5 |
| 7 | 7 | ||
| 8 | #include <linux/bootmem.h> | 8 | #include <linux/memblock.h> |
| 9 | #include <linux/kasan.h> | 9 | #include <linux/kasan.h> |
| 10 | #include <linux/kdebug.h> | 10 | #include <linux/kdebug.h> |
| 11 | #include <linux/memblock.h> | ||
| 12 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/sched/task.h> | 13 | #include <linux/sched/task.h> |
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index 61db77b0eda9..3f452ffed7e9 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/random.h> | 25 | #include <linux/random.h> |
| 26 | #include <linux/memblock.h> | ||
| 26 | 27 | ||
| 27 | #include <asm/pgalloc.h> | 28 | #include <asm/pgalloc.h> |
| 28 | #include <asm/pgtable.h> | 29 | #include <asm/pgtable.h> |
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 16e37d712ffd..1308f5408bf7 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 5 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/bootmem.h> | ||
| 8 | #include <linux/memblock.h> | 7 | #include <linux/memblock.h> |
| 9 | #include <linux/mmzone.h> | 8 | #include <linux/mmzone.h> |
| 10 | #include <linux/ctype.h> | 9 | #include <linux/ctype.h> |
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index e8a4a09e20f1..f2bd3d61e16b 100644 --- a/arch/x86/mm/numa_32.c +++ b/arch/x86/mm/numa_32.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/bootmem.h> | ||
| 26 | #include <linux/memblock.h> | 25 | #include <linux/memblock.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | 27 | ||
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 066f3511d5f1..59d80160fa5a 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Generic VM initialization for x86-64 NUMA setups. | 3 | * Generic VM initialization for x86-64 NUMA setups. |
| 4 | * Copyright 2002,2003 Andi Kleen, SuSE Labs. | 4 | * Copyright 2002,2003 Andi Kleen, SuSE Labs. |
| 5 | */ | 5 | */ |
| 6 | #include <linux/bootmem.h> | 6 | #include <linux/memblock.h> |
| 7 | 7 | ||
| 8 | #include "numa_internal.h" | 8 | #include "numa_internal.h" |
| 9 | 9 | ||
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index b54d52a2d00a..a80fdd7fb40f 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 7 | #include <linux/topology.h> | 7 | #include <linux/topology.h> |
| 8 | #include <linux/memblock.h> | 8 | #include <linux/memblock.h> |
| 9 | #include <linux/bootmem.h> | ||
| 10 | #include <asm/dma.h> | 9 | #include <asm/dma.h> |
| 11 | 10 | ||
| 12 | #include "numa_internal.h" | 11 | #include "numa_internal.h" |
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index a25588ad75ef..08f8f76a4852 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * Clears the a test pte bit on random pages in the direct mapping, | 5 | * Clears the a test pte bit on random pages in the direct mapping, |
| 6 | * then reverts and compares page tables forwards and afterwards. | 6 | * then reverts and compares page tables forwards and afterwards. |
| 7 | */ | 7 | */ |
| 8 | #include <linux/bootmem.h> | 8 | #include <linux/memblock.h> |
| 9 | #include <linux/kthread.h> | 9 | #include <linux/kthread.h> |
| 10 | #include <linux/random.h> | 10 | #include <linux/random.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 62bb30b4bd2a..f799076e3d57 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Thanks to Ben LaHaise for precious feedback. | 3 | * Thanks to Ben LaHaise for precious feedback. |
| 4 | */ | 4 | */ |
| 5 | #include <linux/highmem.h> | 5 | #include <linux/highmem.h> |
| 6 | #include <linux/bootmem.h> | 6 | #include <linux/memblock.h> |
| 7 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 8 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 3d0c83ef6aab..08013524fba1 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/seq_file.h> | 10 | #include <linux/seq_file.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/debugfs.h> | 12 | #include <linux/debugfs.h> |
| 13 | #include <linux/ioport.h> | 13 | #include <linux/ioport.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c index 7f9acb68324c..bdc98150d4db 100644 --- a/arch/x86/mm/physaddr.c +++ b/arch/x86/mm/physaddr.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | #include <linux/bootmem.h> | 2 | #include <linux/memblock.h> |
| 3 | #include <linux/mmdebug.h> | 3 | #include <linux/mmdebug.h> |
| 4 | #include <linux/export.h> | 4 | #include <linux/export.h> |
| 5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index ed4ac215305d..8cd66152cdb0 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/bootmem.h> | 35 | #include <linux/memblock.h> |
| 36 | 36 | ||
| 37 | #include <asm/pat.h> | 37 | #include <asm/pat.h> |
| 38 | #include <asm/e820/api.h> | 38 | #include <asm/e820/api.h> |
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 9061babfbc83..7ae939e353cd 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
| @@ -36,9 +36,8 @@ | |||
| 36 | #include <linux/efi.h> | 36 | #include <linux/efi.h> |
| 37 | #include <linux/efi-bgrt.h> | 37 | #include <linux/efi-bgrt.h> |
| 38 | #include <linux/export.h> | 38 | #include <linux/export.h> |
| 39 | #include <linux/bootmem.h> | ||
| 40 | #include <linux/slab.h> | ||
| 41 | #include <linux/memblock.h> | 39 | #include <linux/memblock.h> |
| 40 | #include <linux/slab.h> | ||
| 42 | #include <linux/spinlock.h> | 41 | #include <linux/spinlock.h> |
| 43 | #include <linux/uaccess.h> | 42 | #include <linux/uaccess.h> |
| 44 | #include <linux/time.h> | 43 | #include <linux/time.h> |
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index e8da7f492970..cf0347f61b21 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
| 28 | #include <linux/mc146818rtc.h> | 28 | #include <linux/mc146818rtc.h> |
| 29 | #include <linux/efi.h> | 29 | #include <linux/efi.h> |
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 4b70d0f5a803..95e77a667ba5 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/efi.h> | 8 | #include <linux/efi.h> |
| 9 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 10 | #include <linux/memblock.h> | 10 | #include <linux/memblock.h> |
| 11 | #include <linux/bootmem.h> | ||
| 12 | #include <linux/acpi.h> | 11 | #include <linux/acpi.h> |
| 13 | #include <linux/dmi.h> | 12 | #include <linux/dmi.h> |
| 14 | 13 | ||
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c index 140cd76ee897..115c8e4173bb 100644 --- a/arch/x86/platform/olpc/olpc_dt.c +++ b/arch/x86/platform/olpc/olpc_dt.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/memblock.h> |
| 21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
| 22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
| 23 | #include <linux/of_pdt.h> | 23 | #include <linux/of_pdt.h> |
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c index 15695e30f982..be15bdcb20df 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/gfp.h> | 9 | #include <linux/gfp.h> |
| 10 | #include <linux/suspend.h> | 10 | #include <linux/suspend.h> |
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | 12 | ||
| 13 | #include <asm/page.h> | 13 | #include <asm/page.h> |
| 14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 67b2f31a1265..e996e8e744cb 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | 2 | ||
| 3 | #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG | 3 | #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG |
| 4 | #include <linux/bootmem.h> | 4 | #include <linux/memblock.h> |
| 5 | #endif | 5 | #endif |
| 6 | #include <linux/cpu.h> | 6 | #include <linux/cpu.h> |
| 7 | #include <linux/kexec.h> | 7 | #include <linux/kexec.h> |
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index ec7a4209f310..2f6787fc7106 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/start_kernel.h> | 23 | #include <linux/start_kernel.h> |
| 24 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 25 | #include <linux/kprobes.h> | 25 | #include <linux/kprobes.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/export.h> | 27 | #include <linux/export.h> |
| 28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 29 | #include <linux/page-flags.h> | 29 | #include <linux/page-flags.h> |
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/console.h> | 31 | #include <linux/console.h> |
| 32 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
| 33 | #include <linux/gfp.h> | 33 | #include <linux/gfp.h> |
| 34 | #include <linux/memblock.h> | ||
| 35 | #include <linux/edd.h> | 34 | #include <linux/edd.h> |
| 36 | #include <linux/frame.h> | 35 | #include <linux/frame.h> |
| 37 | 36 | ||
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index b3e11afed25b..b06731705529 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | #include <linux/hash.h> | 67 | #include <linux/hash.h> |
| 68 | #include <linux/sched.h> | 68 | #include <linux/sched.h> |
| 69 | #include <linux/seq_file.h> | 69 | #include <linux/seq_file.h> |
| 70 | #include <linux/bootmem.h> | ||
| 71 | #include <linux/memblock.h> | 70 | #include <linux/memblock.h> |
| 72 | #include <linux/slab.h> | 71 | #include <linux/slab.h> |
| 73 | #include <linux/vmalloc.h> | 72 | #include <linux/vmalloc.h> |
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index 21f13e9aabe1..5ca440a74316 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/bootmem.h> | 27 | #include <linux/memblock.h> |
| 28 | 28 | ||
| 29 | #include <asm/pci-bridge.h> | 29 | #include <asm/pci-bridge.h> |
| 30 | #include <asm/platform.h> | 30 | #include <asm/platform.h> |
diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c index 9220dcde7520..b27359e2a464 100644 --- a/arch/xtensa/mm/cache.c +++ b/arch/xtensa/mm/cache.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/ptrace.h> | 23 | #include <linux/ptrace.h> |
| 24 | #include <linux/bootmem.h> | 24 | #include <linux/memblock.h> |
| 25 | #include <linux/swap.h> | 25 | #include <linux/swap.h> |
| 26 | #include <linux/pagemap.h> | 26 | #include <linux/pagemap.h> |
| 27 | 27 | ||
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index f7fbe6334939..9750a48f491b 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/gfp.h> | 22 | #include <linux/gfp.h> |
| 23 | #include <linux/highmem.h> | 23 | #include <linux/highmem.h> |
| 24 | #include <linux/swap.h> | 24 | #include <linux/swap.h> |
diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c index 1a30a258ccd0..6b95ca43aec0 100644 --- a/arch/xtensa/mm/kasan_init.c +++ b/arch/xtensa/mm/kasan_init.c | |||
| @@ -8,11 +8,10 @@ | |||
| 8 | * Copyright (C) 2017 Cadence Design Systems Inc. | 8 | * Copyright (C) 2017 Cadence Design Systems Inc. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/init_task.h> | 12 | #include <linux/init_task.h> |
| 13 | #include <linux/kasan.h> | 13 | #include <linux/kasan.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/memblock.h> | ||
| 16 | #include <asm/initialize_mmu.h> | 15 | #include <asm/initialize_mmu.h> |
| 17 | #include <asm/tlbflush.h> | 16 | #include <asm/tlbflush.h> |
| 18 | #include <asm/traps.h> | 17 | #include <asm/traps.h> |
diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c index f33a1ff2662a..a4dcfd39bc5c 100644 --- a/arch/xtensa/mm/mmu.c +++ b/arch/xtensa/mm/mmu.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Extracted from init.c | 5 | * Extracted from init.c |
| 6 | */ | 6 | */ |
| 7 | #include <linux/bootmem.h> | 7 | #include <linux/memblock.h> |
| 8 | #include <linux/percpu.h> | 8 | #include <linux/percpu.h> |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/string.h> | 10 | #include <linux/string.h> |
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index 206b9d4591e8..190846dddc67 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/ioctl.h> | 32 | #include <linux/ioctl.h> |
| 33 | #include <linux/bootmem.h> | 33 | #include <linux/memblock.h> |
| 34 | #include <linux/ethtool.h> | 34 | #include <linux/ethtool.h> |
| 35 | #include <linux/rtnetlink.h> | 35 | #include <linux/rtnetlink.h> |
| 36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
diff --git a/arch/xtensa/platforms/iss/setup.c b/arch/xtensa/platforms/iss/setup.c index 58709e89a8ed..c14cc673976c 100644 --- a/arch/xtensa/platforms/iss/setup.c +++ b/arch/xtensa/platforms/iss/setup.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | * option) any later version. | 16 | * option) any later version. |
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/stddef.h> | 20 | #include <linux/stddef.h> |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
diff --git a/block/blk-settings.c b/block/blk-settings.c index ffd459969689..696c04c1ab6c 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/bio.h> | 7 | #include <linux/bio.h> |
| 8 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 9 | #include <linux/bootmem.h> /* for max_pfn/max_low_pfn */ | 9 | #include <linux/memblock.h> /* for max_pfn/max_low_pfn */ |
| 10 | #include <linux/gcd.h> | 10 | #include <linux/gcd.h> |
| 11 | #include <linux/lcm.h> | 11 | #include <linux/lcm.h> |
| 12 | #include <linux/jiffies.h> | 12 | #include <linux/jiffies.h> |
diff --git a/block/bounce.c b/block/bounce.c index ec0d99995f5f..cf49fe02f65c 100644 --- a/block/bounce.c +++ b/block/bounce.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/hash.h> | 19 | #include <linux/hash.h> |
| 20 | #include <linux/highmem.h> | 20 | #include <linux/highmem.h> |
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/printk.h> | 22 | #include <linux/printk.h> |
| 23 | #include <asm/tlbflush.h> | 23 | #include <asm/tlbflush.h> |
| 24 | 24 | ||
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 85167603b9c9..274699463b4f 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 29 | #include <linux/acpi.h> | 29 | #include <linux/acpi.h> |
| 30 | #include <linux/bootmem.h> | ||
| 31 | #include <linux/memblock.h> | 30 | #include <linux/memblock.h> |
| 32 | #include <linux/numa.h> | 31 | #include <linux/numa.h> |
| 33 | #include <linux/nodemask.h> | 32 | #include <linux/nodemask.h> |
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index a3d012b08fc5..61203eebf3a1 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
| @@ -31,9 +31,8 @@ | |||
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/acpi.h> | 33 | #include <linux/acpi.h> |
| 34 | #include <linux/bootmem.h> | ||
| 35 | #include <linux/earlycpio.h> | ||
| 36 | #include <linux/memblock.h> | 34 | #include <linux/memblock.h> |
| 35 | #include <linux/earlycpio.h> | ||
| 37 | #include <linux/initrd.h> | 36 | #include <linux/initrd.h> |
| 38 | #include "internal.h" | 37 | #include "internal.h" |
| 39 | 38 | ||
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 23cf4427f425..41b91af95afb 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/pm_runtime.h> | 22 | #include <linux/pm_runtime.h> |
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index 5c54d3734daf..5b2867a33b98 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/of_address.h> | 23 | #include <linux/of_address.h> |
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/regmap.h> | 25 | #include <linux/regmap.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 28 | 28 | ||
| 29 | #include "clock.h" | 29 | #include "clock.h" |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index f2483548cde9..099d83e4e910 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <linux/ctype.h> | 5 | #include <linux/ctype.h> |
| 6 | #include <linux/dmi.h> | 6 | #include <linux/dmi.h> |
| 7 | #include <linux/efi.h> | 7 | #include <linux/efi.h> |
| 8 | #include <linux/bootmem.h> | 8 | #include <linux/memblock.h> |
| 9 | #include <linux/random.h> | 9 | #include <linux/random.h> |
| 10 | #include <asm/dmi.h> | 10 | #include <asm/dmi.h> |
| 11 | #include <asm/unaligned.h> | 11 | #include <asm/unaligned.h> |
diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c index 2b675f788b61..ac1654f74dc7 100644 --- a/drivers/firmware/efi/apple-properties.c +++ b/drivers/firmware/efi/apple-properties.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #define pr_fmt(fmt) "apple-properties: " fmt | 21 | #define pr_fmt(fmt) "apple-properties: " fmt |
| 22 | 22 | ||
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/memblock.h> |
| 24 | #include <linux/efi.h> | 24 | #include <linux/efi.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | #include <linux/platform_data/x86/apple.h> | 26 | #include <linux/platform_data/x86/apple.h> |
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c index 2224f1dc074b..72d9ea18270b 100644 --- a/drivers/firmware/iscsi_ibft_find.c +++ b/drivers/firmware/iscsi_ibft_find.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * GNU General Public License for more details. | 18 | * GNU General Public License for more details. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/bootmem.h> | 21 | #include <linux/memblock.h> |
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/ctype.h> | 23 | #include <linux/ctype.h> |
| 24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index 03cead6d5f97..2a23453f005a 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | 25 | ||
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index f9f69f7111a9..44bd5b9166bb 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 | * GNU General Public License for more details. | 12 | * GNU General Public License for more details. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/bootmem.h> | 14 | #include <linux/memblock.h> |
| 15 | #include <linux/bug.h> | 15 | #include <linux/bug.h> |
| 16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
| 17 | #include <linux/component.h> | 17 | #include <linux/component.h> |
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 676c029494e4..0e780848f59b 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 | * GNU General Public License for more details. | 14 | * GNU General Public License for more details. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/bug.h> | 17 | #include <linux/bug.h> |
| 18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
| 19 | #include <linux/component.h> | 19 | #include <linux/component.h> |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 0069f9084f9f..880a81c82b7a 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 25 | #include <linux/dmapool.h> | 25 | #include <linux/dmapool.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 28 | #include <linux/highmem.h> | 28 | #include <linux/highmem.h> |
| 29 | #include <linux/jiffies.h> | 29 | #include <linux/jiffies.h> |
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/of_irq.h> | 38 | #include <linux/of_irq.h> |
| 39 | #include <linux/of_platform.h> | 39 | #include <linux/of_platform.h> |
| 40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
| 41 | #include <linux/memblock.h> | ||
| 42 | #include <linux/sched/signal.h> | 41 | #include <linux/sched/signal.h> |
| 43 | 42 | ||
| 44 | #include <asm/byteorder.h> | 43 | #include <asm/byteorder.h> |
diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c index fc15ec58230a..0d33cf0842ad 100644 --- a/drivers/mtd/ar7part.c +++ b/drivers/mtd/ar7part.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
| 27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
| 28 | #include <linux/bootmem.h> | 28 | #include <linux/memblock.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | 30 | ||
| 31 | #include <uapi/linux/magic.h> | 31 | #include <uapi/linux/magic.h> |
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index a07e24970be4..11c5bad95226 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/netdevice.h> | 35 | #include <linux/netdevice.h> |
| 36 | #include <linux/bootmem.h> | 36 | #include <linux/memblock.h> |
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <linux/io.h> | 39 | #include <linux/io.h> |
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c index 38fa60ddaf2e..28510e33924f 100644 --- a/drivers/net/arcnet/com20020-isa.c +++ b/drivers/net/arcnet/com20020-isa.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <linux/netdevice.h> | 38 | #include <linux/netdevice.h> |
| 39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 40 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
| 41 | #include <linux/bootmem.h> | 41 | #include <linux/memblock.h> |
| 42 | #include <linux/io.h> | 42 | #include <linux/io.h> |
| 43 | 43 | ||
| 44 | #include "arcdevice.h" | 44 | #include "arcdevice.h" |
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index 4e56aaf2b984..2c546013a980 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <linux/ioport.h> | 34 | #include <linux/ioport.h> |
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/netdevice.h> | 36 | #include <linux/netdevice.h> |
| 37 | #include <linux/bootmem.h> | 37 | #include <linux/memblock.h> |
| 38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 40 | #include <linux/io.h> | 40 | #include <linux/io.h> |
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index ffe62a7ae19b..bb532aae0d92 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/crc32.h> | 11 | #include <linux/crc32.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/initrd.h> | 13 | #include <linux/initrd.h> |
| 14 | #include <linux/bootmem.h> | ||
| 15 | #include <linux/memblock.h> | 14 | #include <linux/memblock.h> |
| 16 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
| 17 | #include <linux/of.h> | 16 | #include <linux/of.h> |
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 01e23b85e798..49ae2aa744d6 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #define pr_fmt(fmt) "### dt-test ### " fmt | 6 | #define pr_fmt(fmt) "### dt-test ### " fmt |
| 7 | 7 | ||
| 8 | #include <linux/bootmem.h> | 8 | #include <linux/memblock.h> |
| 9 | #include <linux/clk.h> | 9 | #include <linux/clk.h> |
| 10 | #include <linux/err.h> | 10 | #include <linux/err.h> |
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index 16a4e8528bbc..8f3a2eeb28dc 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * Copyright IBM Corp. 2003, 2009 | 8 | * Copyright IBM Corp. 2003, 2009 |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/bootmem.h> | 11 | #include <linux/memblock.h> |
| 12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 5b8af2782282..2b0c36c2c568 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
| 20 | 20 | ||
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/compat.h> | 23 | #include <linux/compat.h> |
| 24 | 24 | ||
| 25 | #include <asm/ccwdev.h> | 25 | #include <asm/ccwdev.h> |
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index 8af4948dae80..72dd2471ec1e 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #define KMSG_COMPONENT "cio" | 13 | #define KMSG_COMPONENT "cio" |
| 14 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 14 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 15 | 15 | ||
| 16 | #include <linux/bootmem.h> | 16 | #include <linux/memblock.h> |
| 17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c index 8f5c1d7f751a..97b6f197f007 100644 --- a/drivers/s390/virtio/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/kernel_stat.h> | 10 | #include <linux/kernel_stat.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/bootmem.h> | 12 | #include <linux/memblock.h> |
| 13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
| 14 | #include <linux/virtio.h> | 14 | #include <linux/virtio.h> |
| 15 | #include <linux/virtio_config.h> | 15 | #include <linux/virtio_config.h> |
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c index 153b3f3cc795..a5136901dd8a 100644 --- a/drivers/sfi/sfi_core.c +++ b/drivers/sfi/sfi_core.c | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define KMSG_COMPONENT "SFI" | 59 | #define KMSG_COMPONENT "SFI" |
| 60 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 60 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 61 | 61 | ||
| 62 | #include <linux/bootmem.h> | 62 | #include <linux/memblock.h> |
| 63 | #include <linux/kernel.h> | 63 | #include <linux/kernel.h> |
| 64 | #include <linux/module.h> | 64 | #include <linux/module.h> |
| 65 | #include <linux/errno.h> | 65 | #include <linux/errno.h> |
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c index 79ad30d34949..b929c7ae3a27 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/console.h> | 24 | #include <linux/console.h> |
| 25 | #include <linux/sysrq.h> | 25 | #include <linux/sysrq.h> |
| 26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 27 | #include <linux/bootmem.h> | 27 | #include <linux/memblock.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/fs_uart_pd.h> | 29 | #include <linux/fs_uart_pd.h> |
| 30 | #include <linux/of_address.h> | 30 | #include <linux/of_address.h> |
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c index 4eba17f3d293..56fc527015cb 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/console.h> | 19 | #include <linux/console.h> |
| 20 | #include <linux/sysrq.h> | 20 | #include <linux/sysrq.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
| 24 | 24 | ||
| 25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c index e3bff068dc3c..6a1cd03bfe39 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/console.h> | 19 | #include <linux/console.h> |
| 20 | #include <linux/sysrq.h> | 20 | #include <linux/sysrq.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
| 24 | 24 | ||
| 25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index ddc5fa88f268..d2652dccc699 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
| 13 | #include <linux/pci_regs.h> | 13 | #include <linux/pci_regs.h> |
| 14 | #include <linux/pci_ids.h> | 14 | #include <linux/pci_ids.h> |
| 15 | #include <linux/bootmem.h> | ||
| 16 | #include <linux/memblock.h> | 15 | #include <linux/memblock.h> |
| 17 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 18 | #include <asm/pci-direct.h> | 17 | #include <asm/pci-direct.h> |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index e12bb256036f..a3f5cbfcd4a1 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <linux/cred.h> | 44 | #include <linux/cred.h> |
| 45 | #include <linux/errno.h> | 45 | #include <linux/errno.h> |
| 46 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |
| 47 | #include <linux/bootmem.h> | 47 | #include <linux/memblock.h> |
| 48 | #include <linux/pagemap.h> | 48 | #include <linux/pagemap.h> |
| 49 | #include <linux/highmem.h> | 49 | #include <linux/highmem.h> |
| 50 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index e6c1934734b7..93194f3e7540 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/irq.h> | 28 | #include <linux/irq.h> |
| 29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/bootmem.h> | 31 | #include <linux/memblock.h> |
| 32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 33 | #include <linux/irqnr.h> | 33 | #include <linux/irqnr.h> |
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 84575baceebc..f15f89df1f36 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt | 34 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt |
| 35 | 35 | ||
| 36 | #include <linux/bootmem.h> | 36 | #include <linux/memblock.h> |
| 37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 38 | #include <linux/mm.h> | 38 | #include <linux/mm.h> |
| 39 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index c5f26a87d238..2a7f545bd0b5 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt | 36 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt |
| 37 | 37 | ||
| 38 | #include <linux/bootmem.h> | ||
| 39 | #include <linux/memblock.h> | 38 | #include <linux/memblock.h> |
| 40 | #include <linux/dma-direct.h> | 39 | #include <linux/dma-direct.h> |
| 41 | #include <linux/export.h> | 40 | #include <linux/export.h> |
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index 55988b8418ee..5165aa82bf7d 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 68 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 69 | 69 | ||
| 70 | #include <linux/kernel.h> | 70 | #include <linux/kernel.h> |
| 71 | #include <linux/bootmem.h> | 71 | #include <linux/memblock.h> |
| 72 | #include <linux/swap.h> | 72 | #include <linux/swap.h> |
| 73 | #include <linux/mm.h> | 73 | #include <linux/mm.h> |
| 74 | #include <linux/mman.h> | 74 | #include <linux/mman.h> |
diff --git a/fs/dcache.c b/fs/dcache.c index c2e443fb76ae..2593153471cf 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
| 27 | #include <linux/security.h> | 27 | #include <linux/security.h> |
| 28 | #include <linux/seqlock.h> | 28 | #include <linux/seqlock.h> |
| 29 | #include <linux/bootmem.h> | 29 | #include <linux/memblock.h> |
| 30 | #include <linux/bit_spinlock.h> | 30 | #include <linux/bit_spinlock.h> |
| 31 | #include <linux/rculist_bl.h> | 31 | #include <linux/rculist_bl.h> |
| 32 | #include <linux/list_lru.h> | 32 | #include <linux/list_lru.h> |
diff --git a/fs/inode.c b/fs/inode.c index 9b808986d440..9e198f00b64c 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <linux/swap.h> | 10 | #include <linux/swap.h> |
| 11 | #include <linux/security.h> | 11 | #include <linux/security.h> |
| 12 | #include <linux/cdev.h> | 12 | #include <linux/cdev.h> |
| 13 | #include <linux/bootmem.h> | 13 | #include <linux/memblock.h> |
| 14 | #include <linux/fsnotify.h> | 14 | #include <linux/fsnotify.h> |
| 15 | #include <linux/mount.h> | 15 | #include <linux/mount.h> |
| 16 | #include <linux/posix_acl.h> | 16 | #include <linux/posix_acl.h> |
diff --git a/fs/namespace.c b/fs/namespace.c index d86830c86ce8..98d27da43304 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/uaccess.h> | 23 | #include <linux/uaccess.h> |
| 24 | #include <linux/proc_ns.h> | 24 | #include <linux/proc_ns.h> |
| 25 | #include <linux/magic.h> | 25 | #include <linux/magic.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/task_work.h> | 27 | #include <linux/task_work.h> |
| 28 | #include <linux/sched/task.h> | 28 | #include <linux/sched/task.h> |
| 29 | 29 | ||
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index d297fe4472a9..bbcc185062bb 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
| 23 | #include <linux/highmem.h> | 23 | #include <linux/highmem.h> |
| 24 | #include <linux/printk.h> | 24 | #include <linux/printk.h> |
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/memblock.h> |
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 28 | #include <linux/uaccess.h> | 28 | #include <linux/uaccess.h> |
diff --git a/fs/proc/page.c b/fs/proc/page.c index 792c78a49174..6c517b11acf8 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | #include <linux/bootmem.h> | 2 | #include <linux/memblock.h> |
| 3 | #include <linux/compiler.h> | 3 | #include <linux/compiler.h> |
| 4 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
| 5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 0377a104495b..3fe90443c1bb 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 18 | #include <linux/printk.h> | 18 | #include <linux/printk.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/crash_dump.h> | 21 | #include <linux/crash_dump.h> |
| 22 | #include <linux/list.h> | 22 | #include <linux/list.h> |
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h deleted file mode 100644 index b58873a567b2..000000000000 --- a/include/linux/bootmem.h +++ /dev/null | |||
| @@ -1,173 +0,0 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 2 | /* | ||
| 3 | * Discontiguous memory support, Kanoj Sarcar, SGI, Nov 1999 | ||
| 4 | */ | ||
| 5 | #ifndef _LINUX_BOOTMEM_H | ||
| 6 | #define _LINUX_BOOTMEM_H | ||
| 7 | |||
| 8 | #include <linux/mmzone.h> | ||
| 9 | #include <linux/mm_types.h> | ||
| 10 | #include <asm/dma.h> | ||
| 11 | #include <asm/processor.h> | ||
| 12 | |||
| 13 | /* | ||
| 14 | * simple boot-time physical memory area allocator. | ||
| 15 | */ | ||
| 16 | |||
| 17 | extern unsigned long max_low_pfn; | ||
| 18 | extern unsigned long min_low_pfn; | ||
| 19 | |||
| 20 | /* | ||
| 21 | * highest page | ||
| 22 | */ | ||
| 23 | extern unsigned long max_pfn; | ||
| 24 | /* | ||
| 25 | * highest possible page | ||
| 26 | */ | ||
| 27 | extern unsigned long long max_possible_pfn; | ||
| 28 | |||
| 29 | extern unsigned long memblock_free_all(void); | ||
| 30 | extern void reset_node_managed_pages(pg_data_t *pgdat); | ||
| 31 | extern void reset_all_zones_managed_pages(void); | ||
| 32 | |||
| 33 | /* We are using top down, so it is safe to use 0 here */ | ||
| 34 | #define BOOTMEM_LOW_LIMIT 0 | ||
| 35 | |||
| 36 | #ifndef ARCH_LOW_ADDRESS_LIMIT | ||
| 37 | #define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL | ||
| 38 | #endif | ||
| 39 | |||
| 40 | /* FIXME: use MEMBLOCK_ALLOC_* variants here */ | ||
| 41 | #define BOOTMEM_ALLOC_ACCESSIBLE 0 | ||
| 42 | #define BOOTMEM_ALLOC_ANYWHERE (~(phys_addr_t)0) | ||
| 43 | |||
| 44 | /* FIXME: Move to memblock.h at a point where we remove nobootmem.c */ | ||
| 45 | void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align, | ||
| 46 | phys_addr_t min_addr, | ||
| 47 | phys_addr_t max_addr, int nid); | ||
| 48 | void *memblock_alloc_try_nid_nopanic(phys_addr_t size, | ||
| 49 | phys_addr_t align, phys_addr_t min_addr, | ||
| 50 | phys_addr_t max_addr, int nid); | ||
| 51 | void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, | ||
| 52 | phys_addr_t min_addr, phys_addr_t max_addr, int nid); | ||
| 53 | void __memblock_free_early(phys_addr_t base, phys_addr_t size); | ||
| 54 | void __memblock_free_late(phys_addr_t base, phys_addr_t size); | ||
| 55 | |||
| 56 | static inline void * __init memblock_alloc( | ||
| 57 | phys_addr_t size, phys_addr_t align) | ||
| 58 | { | ||
| 59 | return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT, | ||
| 60 | BOOTMEM_ALLOC_ACCESSIBLE, | ||
| 61 | NUMA_NO_NODE); | ||
| 62 | } | ||
| 63 | |||
| 64 | static inline void * __init memblock_alloc_raw( | ||
| 65 | phys_addr_t size, phys_addr_t align) | ||
| 66 | { | ||
| 67 | return memblock_alloc_try_nid_raw(size, align, BOOTMEM_LOW_LIMIT, | ||
| 68 | BOOTMEM_ALLOC_ACCESSIBLE, | ||
| 69 | NUMA_NO_NODE); | ||
| 70 | } | ||
| 71 | |||
| 72 | static inline void * __init memblock_alloc_from( | ||
| 73 | phys_addr_t size, phys_addr_t align, phys_addr_t min_addr) | ||
| 74 | { | ||
| 75 | return memblock_alloc_try_nid(size, align, min_addr, | ||
| 76 | BOOTMEM_ALLOC_ACCESSIBLE, | ||
| 77 | NUMA_NO_NODE); | ||
| 78 | } | ||
| 79 | |||
| 80 | static inline void * __init memblock_alloc_nopanic( | ||
| 81 | phys_addr_t size, phys_addr_t align) | ||
| 82 | { | ||
| 83 | return memblock_alloc_try_nid_nopanic(size, align, | ||
| 84 | BOOTMEM_LOW_LIMIT, | ||
| 85 | BOOTMEM_ALLOC_ACCESSIBLE, | ||
| 86 | NUMA_NO_NODE); | ||
| 87 | } | ||
| 88 | |||
| 89 | static inline void * __init memblock_alloc_low( | ||
| 90 | phys_addr_t size, phys_addr_t align) | ||
| 91 | { | ||
| 92 | return memblock_alloc_try_nid(size, align, | ||
| 93 | BOOTMEM_LOW_LIMIT, | ||
| 94 | ARCH_LOW_ADDRESS_LIMIT, | ||
| 95 | NUMA_NO_NODE); | ||
| 96 | } | ||
| 97 | static inline void * __init memblock_alloc_low_nopanic( | ||
| 98 | phys_addr_t size, phys_addr_t align) | ||
| 99 | { | ||
| 100 | return memblock_alloc_try_nid_nopanic(size, align, | ||
| 101 | BOOTMEM_LOW_LIMIT, | ||
| 102 | ARCH_LOW_ADDRESS_LIMIT, | ||
| 103 | NUMA_NO_NODE); | ||
| 104 | } | ||
| 105 | |||
| 106 | static inline void * __init memblock_alloc_from_nopanic( | ||
| 107 | phys_addr_t size, phys_addr_t align, phys_addr_t min_addr) | ||
| 108 | { | ||
| 109 | return memblock_alloc_try_nid_nopanic(size, align, min_addr, | ||
| 110 | BOOTMEM_ALLOC_ACCESSIBLE, | ||
| 111 | NUMA_NO_NODE); | ||
| 112 | } | ||
| 113 | |||
| 114 | static inline void * __init memblock_alloc_node( | ||
| 115 | phys_addr_t size, phys_addr_t align, int nid) | ||
| 116 | { | ||
| 117 | return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT, | ||
| 118 | BOOTMEM_ALLOC_ACCESSIBLE, nid); | ||
| 119 | } | ||
| 120 | |||
| 121 | static inline void * __init memblock_alloc_node_nopanic( | ||
| 122 | phys_addr_t size, int nid) | ||
| 123 | { | ||
| 124 | return memblock_alloc_try_nid_nopanic(size, 0, BOOTMEM_LOW_LIMIT, | ||
| 125 | BOOTMEM_ALLOC_ACCESSIBLE, | ||
| 126 | nid); | ||
| 127 | } | ||
| 128 | |||
| 129 | static inline void __init memblock_free_early( | ||
| 130 | phys_addr_t base, phys_addr_t size) | ||
| 131 | { | ||
| 132 | __memblock_free_early(base, size); | ||
| 133 | } | ||
| 134 | |||
| 135 | static inline void __init memblock_free_early_nid( | ||
| 136 | phys_addr_t base, phys_addr_t size, int nid) | ||
| 137 | { | ||
| 138 | __memblock_free_early(base, size); | ||
| 139 | } | ||
| 140 | |||
| 141 | static inline void __init memblock_free_late( | ||
| 142 | phys_addr_t base, phys_addr_t size) | ||
| 143 | { | ||
| 144 | __memblock_free_late(base, size); | ||
| 145 | } | ||
| 146 | |||
| 147 | extern void *alloc_large_system_hash(const char *tablename, | ||
| 148 | unsigned long bucketsize, | ||
| 149 | unsigned long numentries, | ||
| 150 | int scale, | ||
| 151 | int flags, | ||
| 152 | unsigned int *_hash_shift, | ||
| 153 | unsigned int *_hash_mask, | ||
| 154 | unsigned long low_limit, | ||
| 155 | unsigned long high_limit); | ||
| 156 | |||
| 157 | #define HASH_EARLY 0x00000001 /* Allocating during early boot? */ | ||
| 158 | #define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min | ||
| 159 | * shift passed via *_hash_shift */ | ||
| 160 | #define HASH_ZERO 0x00000004 /* Zero allocated hash table */ | ||
| 161 | |||
| 162 | /* Only NUMA needs hash distribution. 64bit NUMA architectures have | ||
| 163 | * sufficient vmalloc space. | ||
| 164 | */ | ||
| 165 | #ifdef CONFIG_NUMA | ||
| 166 | #define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT) | ||
| 167 | extern int hashdist; /* Distribute hashes across NUMA nodes? */ | ||
| 168 | #else | ||
| 169 | #define hashdist (0) | ||
| 170 | #endif | ||
| 171 | |||
| 172 | |||
| 173 | #endif /* _LINUX_BOOTMEM_H */ | ||
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 9d46a7204975..1b4d85879cbe 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
| @@ -15,6 +15,19 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <asm/dma.h> | ||
| 19 | |||
| 20 | extern unsigned long max_low_pfn; | ||
| 21 | extern unsigned long min_low_pfn; | ||
| 22 | |||
| 23 | /* | ||
| 24 | * highest page | ||
| 25 | */ | ||
| 26 | extern unsigned long max_pfn; | ||
| 27 | /* | ||
| 28 | * highest possible page | ||
| 29 | */ | ||
| 30 | extern unsigned long long max_possible_pfn; | ||
| 18 | 31 | ||
| 19 | #define INIT_MEMBLOCK_REGIONS 128 | 32 | #define INIT_MEMBLOCK_REGIONS 128 |
| 20 | #define INIT_PHYSMEM_REGIONS 4 | 33 | #define INIT_PHYSMEM_REGIONS 4 |
| @@ -119,6 +132,10 @@ int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); | |||
| 119 | int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); | 132 | int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); |
| 120 | enum memblock_flags choose_memblock_flags(void); | 133 | enum memblock_flags choose_memblock_flags(void); |
| 121 | 134 | ||
| 135 | unsigned long memblock_free_all(void); | ||
| 136 | void reset_node_managed_pages(pg_data_t *pgdat); | ||
| 137 | void reset_all_zones_managed_pages(void); | ||
| 138 | |||
| 122 | /* Low level functions */ | 139 | /* Low level functions */ |
| 123 | int memblock_add_range(struct memblock_type *type, | 140 | int memblock_add_range(struct memblock_type *type, |
| 124 | phys_addr_t base, phys_addr_t size, | 141 | phys_addr_t base, phys_addr_t size, |
| @@ -300,11 +317,116 @@ static inline int memblock_get_region_node(const struct memblock_region *r) | |||
| 300 | } | 317 | } |
| 301 | #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ | 318 | #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ |
| 302 | 319 | ||
| 320 | /* Flags for memblock allocation APIs */ | ||
| 321 | #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0) | ||
| 322 | #define MEMBLOCK_ALLOC_ACCESSIBLE 0 | ||
| 323 | |||
| 324 | /* We are using top down, so it is safe to use 0 here */ | ||
| 325 | #define MEMBLOCK_LOW_LIMIT 0 | ||
| 326 | |||
| 327 | #ifndef ARCH_LOW_ADDRESS_LIMIT | ||
| 328 | #define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL | ||
| 329 | #endif | ||
| 330 | |||
| 303 | phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid); | 331 | phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid); |
| 304 | phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid); | 332 | phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid); |
| 305 | 333 | ||
| 306 | phys_addr_t memblock_phys_alloc(phys_addr_t size, phys_addr_t align); | 334 | phys_addr_t memblock_phys_alloc(phys_addr_t size, phys_addr_t align); |
| 307 | 335 | ||
| 336 | void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align, | ||
| 337 | phys_addr_t min_addr, phys_addr_t max_addr, | ||
| 338 | int nid); | ||
| 339 | void *memblock_alloc_try_nid_nopanic(phys_addr_t size, phys_addr_t align, | ||
| 340 | phys_addr_t min_addr, phys_addr_t max_addr, | ||
| 341 | int nid); | ||
| 342 | void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, | ||
| 343 | phys_addr_t min_addr, phys_addr_t max_addr, | ||
| 344 | int nid); | ||
| 345 | |||
| 346 | static inline void * __init memblock_alloc(phys_addr_t size, phys_addr_t align) | ||
| 347 | { | ||
| 348 | return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT, | ||
| 349 | MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE); | ||
| 350 | } | ||
| 351 | |||
| 352 | static inline void * __init memblock_alloc_raw(phys_addr_t size, | ||
| 353 | phys_addr_t align) | ||
| 354 | { | ||
| 355 | return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT, | ||
| 356 | MEMBLOCK_ALLOC_ACCESSIBLE, | ||
| 357 | NUMA_NO_NODE); | ||
| 358 | } | ||
| 359 | |||
| 360 | static inline void * __init memblock_alloc_from(phys_addr_t size, | ||
| 361 | phys_addr_t align, | ||
| 362 | phys_addr_t min_addr) | ||
| 363 | { | ||
| 364 | return memblock_alloc_try_nid(size, align, min_addr, | ||
| 365 | MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE); | ||
| 366 | } | ||
| 367 | |||
| 368 | static inline void * __init memblock_alloc_nopanic(phys_addr_t size, | ||
| 369 | phys_addr_t align) | ||
| 370 | { | ||
| 371 | return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT, | ||
| 372 | MEMBLOCK_ALLOC_ACCESSIBLE, | ||
| 373 | NUMA_NO_NODE); | ||
| 374 | } | ||
| 375 | |||
| 376 | static inline void * __init memblock_alloc_low(phys_addr_t size, | ||
| 377 | phys_addr_t align) | ||
| 378 | { | ||
| 379 | return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT, | ||
| 380 | ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE); | ||
| 381 | } | ||
| 382 | static inline void * __init memblock_alloc_low_nopanic(phys_addr_t size, | ||
| 383 | phys_addr_t align) | ||
| 384 | { | ||
| 385 | return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT, | ||
| 386 | ARCH_LOW_ADDRESS_LIMIT, | ||
| 387 | NUMA_NO_NODE); | ||
| 388 | } | ||
| 389 | |||
| 390 | static inline void * __init memblock_alloc_from_nopanic(phys_addr_t size, | ||
| 391 | phys_addr_t align, | ||
| 392 | phys_addr_t min_addr) | ||
| 393 | { | ||
| 394 | return memblock_alloc_try_nid_nopanic(size, align, min_addr, | ||
| 395 | MEMBLOCK_ALLOC_ACCESSIBLE, | ||
| 396 | NUMA_NO_NODE); | ||
| 397 | } | ||
| 398 | |||
| 399 | static inline void * __init memblock_alloc_node(phys_addr_t size, | ||
| 400 | phys_addr_t align, int nid) | ||
| 401 | { | ||
| 402 | return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT, | ||
| 403 | MEMBLOCK_ALLOC_ACCESSIBLE, nid); | ||
| 404 | } | ||
| 405 | |||
| 406 | static inline void * __init memblock_alloc_node_nopanic(phys_addr_t size, | ||
| 407 | int nid) | ||
| 408 | { | ||
| 409 | return memblock_alloc_try_nid_nopanic(size, 0, MEMBLOCK_LOW_LIMIT, | ||
| 410 | MEMBLOCK_ALLOC_ACCESSIBLE, nid); | ||
| 411 | } | ||
| 412 | |||
| 413 | static inline void __init memblock_free_early(phys_addr_t base, | ||
| 414 | phys_addr_t size) | ||
| 415 | { | ||
| 416 | __memblock_free_early(base, size); | ||
| 417 | } | ||
| 418 | |||
| 419 | static inline void __init memblock_free_early_nid(phys_addr_t base, | ||
| 420 | phys_addr_t size, int nid) | ||
| 421 | { | ||
| 422 | __memblock_free_early(base, size); | ||
| 423 | } | ||
| 424 | |||
| 425 | static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size) | ||
| 426 | { | ||
| 427 | __memblock_free_late(base, size); | ||
| 428 | } | ||
| 429 | |||
| 308 | /* | 430 | /* |
| 309 | * Set the allocation direction to bottom-up or top-down. | 431 | * Set the allocation direction to bottom-up or top-down. |
| 310 | */ | 432 | */ |
| @@ -323,10 +445,6 @@ static inline bool memblock_bottom_up(void) | |||
| 323 | return memblock.bottom_up; | 445 | return memblock.bottom_up; |
| 324 | } | 446 | } |
| 325 | 447 | ||
| 326 | /* Flags for memblock_alloc_base() amd __memblock_alloc_base() */ | ||
| 327 | #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0) | ||
| 328 | #define MEMBLOCK_ALLOC_ACCESSIBLE 0 | ||
| 329 | |||
| 330 | phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align, | 448 | phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align, |
| 331 | phys_addr_t start, phys_addr_t end, | 449 | phys_addr_t start, phys_addr_t end, |
| 332 | enum memblock_flags flags); | 450 | enum memblock_flags flags); |
| @@ -432,6 +550,31 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo | |||
| 432 | i < memblock_type->cnt; \ | 550 | i < memblock_type->cnt; \ |
| 433 | i++, rgn = &memblock_type->regions[i]) | 551 | i++, rgn = &memblock_type->regions[i]) |
| 434 | 552 | ||
| 553 | extern void *alloc_large_system_hash(const char *tablename, | ||
| 554 | unsigned long bucketsize, | ||
| 555 | unsigned long numentries, | ||
| 556 | int scale, | ||
| 557 | int flags, | ||
| 558 | unsigned int *_hash_shift, | ||
| 559 | unsigned int *_hash_mask, | ||
| 560 | unsigned long low_limit, | ||
| 561 | unsigned long high_limit); | ||
| 562 | |||
| 563 | #define HASH_EARLY 0x00000001 /* Allocating during early boot? */ | ||
| 564 | #define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min | ||
| 565 | * shift passed via *_hash_shift */ | ||
| 566 | #define HASH_ZERO 0x00000004 /* Zero allocated hash table */ | ||
| 567 | |||
| 568 | /* Only NUMA needs hash distribution. 64bit NUMA architectures have | ||
| 569 | * sufficient vmalloc space. | ||
| 570 | */ | ||
| 571 | #ifdef CONFIG_NUMA | ||
| 572 | #define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT) | ||
| 573 | extern int hashdist; /* Distribute hashes across NUMA nodes? */ | ||
| 574 | #else | ||
| 575 | #define hashdist (0) | ||
| 576 | #endif | ||
| 577 | |||
| 435 | #ifdef CONFIG_MEMTEST | 578 | #ifdef CONFIG_MEMTEST |
| 436 | extern void early_memtest(phys_addr_t start, phys_addr_t end); | 579 | extern void early_memtest(phys_addr_t start, phys_addr_t end); |
| 437 | #else | 580 | #else |
diff --git a/init/main.c b/init/main.c index 8cef69c61389..51b8e7b8ae5b 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/initrd.h> | 27 | #include <linux/initrd.h> |
| 28 | #include <linux/bootmem.h> | 28 | #include <linux/memblock.h> |
| 29 | #include <linux/acpi.h> | 29 | #include <linux/acpi.h> |
| 30 | #include <linux/console.h> | 30 | #include <linux/console.h> |
| 31 | #include <linux/nmi.h> | 31 | #include <linux/nmi.h> |
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index f14c376937e5..22a12ab5a5e9 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * DMA operations that map physical memory directly without using an IOMMU. | 5 | * DMA operations that map physical memory directly without using an IOMMU. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/bootmem.h> /* for max_pfn */ | 7 | #include <linux/memblock.h> /* for max_pfn */ |
| 8 | #include <linux/export.h> | 8 | #include <linux/export.h> |
| 9 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
| 10 | #include <linux/dma-direct.h> | 10 | #include <linux/dma-direct.h> |
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 801da67e957b..5731daa09a32 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <asm/dma.h> | 40 | #include <asm/dma.h> |
| 41 | 41 | ||
| 42 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 43 | #include <linux/bootmem.h> | 43 | #include <linux/memblock.h> |
| 44 | #include <linux/iommu-helper.h> | 44 | #include <linux/iommu-helper.h> |
| 45 | 45 | ||
| 46 | #define CREATE_TRACE_POINTS | 46 | #define CREATE_TRACE_POINTS |
diff --git a/kernel/futex.c b/kernel/futex.c index 3e2de8fc1891..f423f9b6577e 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | #include <linux/sched/mm.h> | 65 | #include <linux/sched/mm.h> |
| 66 | #include <linux/hugetlb.h> | 66 | #include <linux/hugetlb.h> |
| 67 | #include <linux/freezer.h> | 67 | #include <linux/freezer.h> |
| 68 | #include <linux/bootmem.h> | 68 | #include <linux/memblock.h> |
| 69 | #include <linux/fault-inject.h> | 69 | #include <linux/fault-inject.h> |
| 70 | 70 | ||
| 71 | #include <asm/futex.h> | 71 | #include <asm/futex.h> |
diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 0130e488ebfe..8f36c27c1794 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #endif | 4 | #endif |
| 5 | 5 | ||
| 6 | #include <linux/hash.h> | 6 | #include <linux/hash.h> |
| 7 | #include <linux/bootmem.h> | 7 | #include <linux/memblock.h> |
| 8 | #include <linux/debug_locks.h> | 8 | #include <linux/debug_locks.h> |
| 9 | 9 | ||
| 10 | /* | 10 | /* |
diff --git a/kernel/pid.c b/kernel/pid.c index cdf63e53a014..b2f6c506035d 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/rculist.h> | 33 | #include <linux/rculist.h> |
| 34 | #include <linux/bootmem.h> | 34 | #include <linux/memblock.h> |
| 35 | #include <linux/hash.h> | 35 | #include <linux/hash.h> |
| 36 | #include <linux/pid_namespace.h> | 36 | #include <linux/pid_namespace.h> |
| 37 | #include <linux/init_task.h> | 37 | #include <linux/init_task.h> |
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 34116a6097be..3c9e365438ad 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/pm.h> | 23 | #include <linux/pm.h> |
| 24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/bootmem.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/nmi.h> | 27 | #include <linux/nmi.h> |
| 28 | #include <linux/syscalls.h> | 28 | #include <linux/syscalls.h> |
| 29 | #include <linux/console.h> | 29 | #include <linux/console.h> |
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 429e4a3833ca..1b2a029360b7 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/smp.h> | 32 | #include <linux/smp.h> |
| 33 | #include <linux/security.h> | 33 | #include <linux/security.h> |
| 34 | #include <linux/bootmem.h> | ||
| 35 | #include <linux/memblock.h> | 34 | #include <linux/memblock.h> |
| 36 | #include <linux/syscalls.h> | 35 | #include <linux/syscalls.h> |
| 37 | #include <linux/crash_core.h> | 36 | #include <linux/crash_core.h> |
diff --git a/kernel/profile.c b/kernel/profile.c index 9aa2a4445b0d..9c08a2c7cb1d 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
| 18 | #include <linux/profile.h> | 18 | #include <linux/profile.h> |
| 19 | #include <linux/bootmem.h> | 19 | #include <linux/memblock.h> |
| 20 | #include <linux/notifier.h> | 20 | #include <linux/notifier.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/cpumask.h> | 22 | #include <linux/cpumask.h> |
diff --git a/lib/cpumask.c b/lib/cpumask.c index 1405cb22e6bc..75b5e7672c4c 100644 --- a/lib/cpumask.c +++ b/lib/cpumask.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <linux/bitops.h> | 4 | #include <linux/bitops.h> |
| 5 | #include <linux/cpumask.h> | 5 | #include <linux/cpumask.h> |
| 6 | #include <linux/export.h> | 6 | #include <linux/export.h> |
| 7 | #include <linux/bootmem.h> | 7 | #include <linux/memblock.h> |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | * cpumask_next - get the next cpu in a cpumask | 10 | * cpumask_next - get the next cpu in a cpumask |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e35d99844612..c007fb5fb8d5 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/compiler.h> | 15 | #include <linux/compiler.h> |
| 16 | #include <linux/cpuset.h> | 16 | #include <linux/cpuset.h> |
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/bootmem.h> | ||
| 19 | #include <linux/memblock.h> | 18 | #include <linux/memblock.h> |
| 20 | #include <linux/sysfs.h> | 19 | #include <linux/sysfs.h> |
| 21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
diff --git a/mm/kasan/kasan_init.c b/mm/kasan/kasan_init.c index 785a9707786b..c7550eb65922 100644 --- a/mm/kasan/kasan_init.c +++ b/mm/kasan/kasan_init.c | |||
| @@ -10,11 +10,10 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/bootmem.h> | 13 | #include <linux/memblock.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/kasan.h> | 15 | #include <linux/kasan.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/memblock.h> | ||
| 18 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 19 | #include <linux/pfn.h> | 18 | #include <linux/pfn.h> |
| 20 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 4f7e4b5a2f08..877de4fa0720 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
| @@ -92,7 +92,7 @@ | |||
| 92 | #include <linux/stacktrace.h> | 92 | #include <linux/stacktrace.h> |
| 93 | #include <linux/cache.h> | 93 | #include <linux/cache.h> |
| 94 | #include <linux/percpu.h> | 94 | #include <linux/percpu.h> |
| 95 | #include <linux/bootmem.h> | 95 | #include <linux/memblock.h> |
| 96 | #include <linux/pfn.h> | 96 | #include <linux/pfn.h> |
| 97 | #include <linux/mmzone.h> | 97 | #include <linux/mmzone.h> |
| 98 | #include <linux/slab.h> | 98 | #include <linux/slab.h> |
diff --git a/mm/memblock.c b/mm/memblock.c index 2ed73245b5da..c655342569f8 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/kmemleak.h> | 20 | #include <linux/kmemleak.h> |
| 21 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
| 22 | #include <linux/memblock.h> | 22 | #include <linux/memblock.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | 23 | ||
| 25 | #include <asm/sections.h> | 24 | #include <asm/sections.h> |
| 26 | #include <linux/io.h> | 25 | #include <linux/io.h> |
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7e6509a53d79..41e326472ef9 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/stop_machine.h> | 33 | #include <linux/stop_machine.h> |
| 34 | #include <linux/hugetlb.h> | 34 | #include <linux/hugetlb.h> |
| 35 | #include <linux/memblock.h> | 35 | #include <linux/memblock.h> |
| 36 | #include <linux/bootmem.h> | ||
| 37 | #include <linux/compaction.h> | 36 | #include <linux/compaction.h> |
| 38 | 37 | ||
| 39 | #include <asm/tlbflush.h> | 38 | #include <asm/tlbflush.h> |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5f3291601945..ef289fadec0e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/pagemap.h> | 21 | #include <linux/pagemap.h> |
| 22 | #include <linux/jiffies.h> | 22 | #include <linux/jiffies.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
| 26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
diff --git a/mm/page_ext.c b/mm/page_ext.c index 5323c2ade686..ae44f7adbe07 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | #include <linux/mm.h> | 2 | #include <linux/mm.h> |
| 3 | #include <linux/mmzone.h> | 3 | #include <linux/mmzone.h> |
| 4 | #include <linux/bootmem.h> | 4 | #include <linux/memblock.h> |
| 5 | #include <linux/page_ext.h> | 5 | #include <linux/page_ext.h> |
| 6 | #include <linux/memory.h> | 6 | #include <linux/memory.h> |
| 7 | #include <linux/vmalloc.h> | 7 | #include <linux/vmalloc.h> |
diff --git a/mm/page_idle.c b/mm/page_idle.c index 6302bc62c27d..b9e4b42b33ab 100644 --- a/mm/page_idle.c +++ b/mm/page_idle.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | #include <linux/init.h> | 2 | #include <linux/init.h> |
| 3 | #include <linux/bootmem.h> | 3 | #include <linux/memblock.h> |
| 4 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
| 5 | #include <linux/sysfs.h> | 5 | #include <linux/sysfs.h> |
| 6 | #include <linux/kobject.h> | 6 | #include <linux/kobject.h> |
diff --git a/mm/page_owner.c b/mm/page_owner.c index d80adfe702d3..87bc0dfdb52b 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include <linux/mm.h> | 3 | #include <linux/mm.h> |
| 4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
| 5 | #include <linux/uaccess.h> | 5 | #include <linux/uaccess.h> |
| 6 | #include <linux/bootmem.h> | 6 | #include <linux/memblock.h> |
| 7 | #include <linux/stacktrace.h> | 7 | #include <linux/stacktrace.h> |
| 8 | #include <linux/page_owner.h> | 8 | #include <linux/page_owner.h> |
| 9 | #include <linux/jump_label.h> | 9 | #include <linux/jump_label.h> |
diff --git a/mm/percpu.c b/mm/percpu.c index 3050c1d37d37..61cdbb3b3736 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 65 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 66 | 66 | ||
| 67 | #include <linux/bitmap.h> | 67 | #include <linux/bitmap.h> |
| 68 | #include <linux/bootmem.h> | 68 | #include <linux/memblock.h> |
| 69 | #include <linux/err.h> | 69 | #include <linux/err.h> |
| 70 | #include <linux/lcm.h> | 70 | #include <linux/lcm.h> |
| 71 | #include <linux/list.h> | 71 | #include <linux/list.h> |
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 7408cabed61a..7fec05796796 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/mmzone.h> | 22 | #include <linux/mmzone.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/memblock.h> | 23 | #include <linux/memblock.h> |
| 25 | #include <linux/memremap.h> | 24 | #include <linux/memremap.h> |
| 26 | #include <linux/highmem.h> | 25 | #include <linux/highmem.h> |
diff --git a/mm/sparse.c b/mm/sparse.c index b139fbc61d10..ab2ac45e0440 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 6 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
| 7 | #include <linux/mmzone.h> | 7 | #include <linux/mmzone.h> |
| 8 | #include <linux/bootmem.h> | ||
| 9 | #include <linux/memblock.h> | 8 | #include <linux/memblock.h> |
| 10 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
| 11 | #include <linux/highmem.h> | 10 | #include <linux/highmem.h> |
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index f5c9ef2586de..411dd7a90046 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/wait.h> | 20 | #include <linux/wait.h> |
| 21 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/memblock.h> |
| 23 | 23 | ||
| 24 | #include <net/addrconf.h> | 24 | #include <net/addrconf.h> |
| 25 | #include <net/inet_connection_sock.h> | 25 | #include <net/inet_connection_sock.h> |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1834818ed07b..9e6bc4d6daa7 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -262,7 +262,7 @@ | |||
| 262 | #include <linux/net.h> | 262 | #include <linux/net.h> |
| 263 | #include <linux/socket.h> | 263 | #include <linux/socket.h> |
| 264 | #include <linux/random.h> | 264 | #include <linux/random.h> |
| 265 | #include <linux/bootmem.h> | 265 | #include <linux/memblock.h> |
| 266 | #include <linux/highmem.h> | 266 | #include <linux/highmem.h> |
| 267 | #include <linux/swap.h> | 267 | #include <linux/swap.h> |
| 268 | #include <linux/cache.h> | 268 | #include <linux/cache.h> |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index ca3ed931f2a9..1976fddb9e00 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -81,7 +81,7 @@ | |||
| 81 | 81 | ||
| 82 | #include <linux/uaccess.h> | 82 | #include <linux/uaccess.h> |
| 83 | #include <asm/ioctls.h> | 83 | #include <asm/ioctls.h> |
| 84 | #include <linux/bootmem.h> | 84 | #include <linux/memblock.h> |
| 85 | #include <linux/highmem.h> | 85 | #include <linux/highmem.h> |
| 86 | #include <linux/swap.h> | 86 | #include <linux/swap.h> |
| 87 | #include <linux/types.h> | 87 | #include <linux/types.h> |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index e948db29ab53..9b277bd36d1a 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 47 | #include <linux/inetdevice.h> | 47 | #include <linux/inetdevice.h> |
| 48 | #include <linux/seq_file.h> | 48 | #include <linux/seq_file.h> |
| 49 | #include <linux/bootmem.h> | 49 | #include <linux/memblock.h> |
| 50 | #include <linux/highmem.h> | 50 | #include <linux/highmem.h> |
| 51 | #include <linux/swap.h> | 51 | #include <linux/swap.h> |
| 52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c index 2ad33ce1ea17..eca8d84d99bf 100644 --- a/net/xfrm/xfrm_hash.c +++ b/net/xfrm/xfrm_hash.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 9 | #include <linux/bootmem.h> | 9 | #include <linux/memblock.h> |
| 10 | #include <linux/vmalloc.h> | 10 | #include <linux/vmalloc.h> |
| 11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
| 12 | #include <linux/xfrm.h> | 12 | #include <linux/xfrm.h> |