mm: remove include/linux/bootmem.h

author Mike Rapoport <rppt@linux.vnet.ibm.com>

Tue, 30 Oct 2018 22:09:49 +0000 (15:09 -0700)

committer Linus Torvalds <torvalds@linux-foundation.org>

Wed, 31 Oct 2018 15:54:16 +0000 (08:54 -0700)
author Mike Rapoport <rppt@linux.vnet.ibm.com>
Tue, 30 Oct 2018 22:09:49 +0000 (15:09 -0700)
committer Linus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Oct 2018 15:54:16 +0000 (08:54 -0700)
diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c

index 026ee955fd1050e464b911c67858fc82ae9d97bb..867e8730b0c5c4819a19983efa19522a0984f760 100644 (file)
--- a/arch/alpha/kernel/core_cia.c
+++ b/arch/alpha/kernel/core_cia.c
@@ -21,7 +21,7 @@
  #include <linux/pci.h>
  #include <linux/sched.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/ptrace.h>
  #include <asm/mce.h>
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c

index 35572be9deb573eb8bb5b4e47e3e8ded395bb941..a9fd133a7fb2aad635d4d2782be5569e10251e2d 100644 (file)
--- a/arch/alpha/kernel/core_irongate.c
+++ b/arch/alpha/kernel/core_irongate.c
@@ -20,7 +20,6 @@
  #include <linux/sched.h>
  #include <linux/init.h>
  #include <linux/initrd.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  
  #include <asm/ptrace.h>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c

index 1f00c9433b10cc99eab75140f98997827ed0149d..8a568c4d8e81cedcb5a9c91c93f32f480e4a0294 100644 (file)
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -18,7 +18,7 @@
  #include <linux/mc146818rtc.h>
  #include <linux/rtc.h>
  #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/ptrace.h>
  #include <asm/smp.h>
diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c

index 132b06bdf9031f7105b81738325110f33a37bb6f..97551597581b07fcd96eabf50d3298e428d02f9a 100644 (file)
--- a/arch/alpha/kernel/core_titan.c
+++ b/arch/alpha/kernel/core_titan.c
@@ -16,7 +16,7 @@
  #include <linux/sched.h>
  #include <linux/init.h>
  #include <linux/vmalloc.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/ptrace.h>
  #include <asm/smp.h>
diff --git a/arch/alpha/kernel/core_tsunami.c b/arch/alpha/kernel/core_tsunami.c

index e7c956ea46b64497e3a7cb70928a37e758225375..f334b8928d72a9c2ac68b102775094b55427bb0c 100644 (file)
--- a/arch/alpha/kernel/core_tsunami.c
+++ b/arch/alpha/kernel/core_tsunami.c
@@ -17,7 +17,7 @@
  #include <linux/pci.h>
  #include <linux/sched.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/ptrace.h>
  #include <asm/smp.h>
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c

index 59cbfc2bf2c595ae3cc3ea06aac1ffdac2cf51a8..a9378ee0c2f19b46c398782beacc74e91586921a 100644 (file)
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -7,7 +7,7 @@
  
  #include <linux/pci.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/gfp.h>
  #include <linux/capability.h>
  #include <linux/mm.h>
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c

index 4cc3eb92f55b8e01fc3cafb56e85b82c1c1df130..13937e72d875748a0406fc2e17627ada27cc299a 100644 (file)
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -18,7 +18,7 @@
  #include <linux/init.h>
  #include <linux/ioport.h>
  #include <linux/kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/module.h>
  #include <linux/cache.h>
  #include <linux/slab.h>
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c

index 5d178c7ba5b2b057720addbb02388e37e62f82ef..82cf950bda2a1f2f989107324b31583be6099d6c 100644 (file)
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -7,7 +7,7 @@
  #include <linux/mm.h>
  #include <linux/pci.h>
  #include <linux/gfp.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/scatterlist.h>
  #include <linux/log2.h>
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c

index 64c06a0adf3d03d33285f0b5ca280e01db09b797..a37fd990bd5548933d89ce3949341f9e8a17d008 100644 (file)
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -29,7 +29,6 @@
  #include <linux/string.h>
  #include <linux/ioport.h>
  #include <linux/platform_device.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/pci.h>
  #include <linux/seq_file.h>
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c

index ff4f54b86c7f5628e42b519c6115913fde5bf371..cd9a112d67ff10cb1e4e360ef8793dabadea3f8b 100644 (file)
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -32,7 +32,7 @@
  #include <linux/pci.h>
  #include <linux/init.h>
  #include <linux/reboot.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/bitops.h>
  
  #include <asm/ptrace.h>
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c

index 853d153449345ff064d76ec61e560cebb91090ba..a42fc5c4db893fdafa5825347600f1baff9890db 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -19,7 +19,7 @@
  #include <linux/mm.h>
  #include <linux/swap.h>
  #include <linux/init.h>
-#include <linux/bootmem.h> /* max_low_pfn */
+#include <linux/memblock.h> /* max_low_pfn */
  #include <linux/vmalloc.h>
  #include <linux/gfp.h>
  
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c

index 26cd925d19b16bfbd7efbf7aad085119f27445ea..74846553e3f18682a958bf6373923830f2b8168a 100644 (file)
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -10,7 +10,6 @@
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/swap.h>
  #include <linux/initrd.h>
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c

index 2a01dd1005f44d3c22f34a56f0e699d09c8e0beb..d34f69eb1a955f593925d3f6e187206cdaa3ff20 100644 (file)
--- a/arch/arc/kernel/unwind.c
+++ b/arch/arc/kernel/unwind.c
@@ -15,7 +15,7 @@
  
  #include <linux/sched.h>
  #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/sort.h>
  #include <linux/slab.h>
  #include <linux/stop_machine.h>
diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c

index f582dc8944c9524a3b847bd043760f08f19829a0..48e70015181048640e083e4c1f8b1deb9a02b95d 100644 (file)
--- a/arch/arc/mm/highmem.c
+++ b/arch/arc/mm/highmem.c
@@ -7,7 +7,7 @@
   *
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/highmem.h>
  #include <asm/processor.h>
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c

index 0f29c6548779b00768af265bcd1404a042d764da..f8fe5668b30fd98412c8fbf45433d3b8718158d4 100644 (file)
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -8,7 +8,6 @@
  
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #ifdef CONFIG_BLK_DEV_INITRD
  #include <linux/initrd.h>
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c

index 13bcd3b867cbab7991470e507a6a22986a34b013..e3057c1b55b9643c449d78c599096baba91b6de0 100644 (file)
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -12,7 +12,6 @@
  #include <linux/export.h>
  #include <linux/errno.h>
  #include <linux/types.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/of.h>
  #include <linux/of_fdt.h>
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c

index 39e6090d23acc4f1fba831b41096b5ac11b842de..840a4adc69fcf429310b451d5d60b97211091899 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -16,7 +16,6 @@
  #include <linux/utsname.h>
  #include <linux/initrd.h>
  #include <linux/console.h>
-#include <linux/bootmem.h>
  #include <linux/seq_file.h>
  #include <linux/screen_info.h>
  #include <linux/of_platform.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c

index 1f9b34a7eccdd3b8f73c4d8630111c4e88d2199d..cd5732ab0cdf78f9bf5967dc212d5ceeaede08ef 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -141,7 +141,7 @@
  #include <linux/cpu.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <linux/platform_data/ti-sysc.h>
  
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c

index 66566472c15384c6eb9fc0bea6045b8c8287e972..661fe48ab78da175732920d87046ec7460bc5d8f 100644 (file)
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -9,7 +9,6 @@
   *
   *  DMA uncached mapping support.
   */
-#include <linux/bootmem.h>
  #include <linux/module.h>
  #include <linux/mm.h>
  #include <linux/genalloc.h>
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c

index d421a10c93a83b22327f5cb5b85f88402aa8ff4d..32e4845af2b66fe1af4c1b43601b05b1fd1c51f8 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -11,7 +11,6 @@
  #include <linux/errno.h>
  #include <linux/swap.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
  #include <linux/mman.h>
  #include <linux/sched/signal.h>
  #include <linux/sched/task.h>
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c

index 785d2a562a231390e8f22933297da682c43145db..cb44aa290e73c5290586f737fe5ffae2f108bae6 100644 (file)
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -1,6 +1,5 @@
  #include <linux/cpu.h>
  #include <linux/dma-mapping.h>
-#include <linux/bootmem.h>
  #include <linux/gfp.h>
  #include <linux/highmem.h>
  #include <linux/export.h>
diff --git a/arch/arm/xen/p2m.c b/arch/arm/xen/p2m.c

index 0641ba54ab62ae9786cb12ab88b2666b5c783b7a..e70a49fc8dcd1f8c13a260c91ace70a2e299393c 100644 (file)
--- a/arch/arm/xen/p2m.c
+++ b/arch/arm/xen/p2m.c
@@ -1,4 +1,4 @@
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/gfp.h>
  #include <linux/export.h>
  #include <linux/spinlock.h>
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c

index ed46dc188b225d2d0aec587f435b5b2ce774c5cd..44e3c351e1ea6efe09426697b2ca7a99f3cd6040 100644 (file)
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -16,7 +16,6 @@
  #define pr_fmt(fmt) "ACPI: " fmt
  
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
  #include <linux/cpumask.h>
  #include <linux/efi.h>
  #include <linux/efi-bgrt.h>
diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c

index 4f4f1815e0471e0eb2e242b8462a7e4eb8e8b137..eac1d0cc595ca8cc2fda38de34549f02d508c8e1 100644 (file)
--- a/arch/arm64/kernel/acpi_numa.c
+++ b/arch/arm64/kernel/acpi_numa.c
@@ -18,7 +18,6 @@
  
  #include <linux/acpi.h>
  #include <linux/bitmap.h>
-#include <linux/bootmem.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
  #include <linux/memblock.h>
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c

index 3428427f6c9349d35bf0d4a695b1c40c1ecc6bf6..7ce7306f1d75e9582759afb36dff48266ebced21 100644 (file)
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -26,7 +26,6 @@
  #include <linux/initrd.h>
  #include <linux/console.h>
  #include <linux/cache.h>
-#include <linux/bootmem.h>
  #include <linux/screen_info.h>
  #include <linux/init.h>
  #include <linux/kexec.h>
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c

index d190612b8f33b2555ffe447bfa72421b34430c4c..3a703e5d4e3237f9844d09e871ef1eaa62b781cc 100644 (file)
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -19,7 +19,7 @@
  
  #include <linux/gfp.h>
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/cache.h>
  #include <linux/export.h>
  #include <linux/slab.h>
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c

index d8d73073835fcf10168bade103b7eb225cbd1b82..9d9582cac6c40cad483d431682a178c67c445b45 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -22,7 +22,6 @@
  #include <linux/errno.h>
  #include <linux/swap.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
  #include <linux/cache.h>
  #include <linux/mman.h>
  #include <linux/nodemask.h>
diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c

index 6a65a2912d360224a42d42a079d1b3097b4a5788..63527e585aaceb6163f34898a0f4d389a3d61a03 100644 (file)
--- a/arch/arm64/mm/kasan_init.c
+++ b/arch/arm64/mm/kasan_init.c
@@ -11,7 +11,6 @@
   */
  
  #define pr_fmt(fmt) "kasan: " fmt
-#include <linux/bootmem.h>
  #include <linux/kasan.h>
  #include <linux/kernel.h>
  #include <linux/sched/task.h>
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c

index 0bff116c07a881f9bba9bc55d2bb1681bbe7ea63..27a31efd9e8e9ba569651961e325c3e2c6c5b32f 100644 (file)
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -20,7 +20,6 @@
  #define pr_fmt(fmt) "NUMA: " fmt
  
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/module.h>
  #include <linux/of.h>
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c

index 05d96a9541b5873027c8a2a7d9a41a36745c5ea7..2e1c0ea22eb07663dfe14ef210bd92d1c9c5f810 100644 (file)
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -11,7 +11,6 @@
  #include <linux/dma-mapping.h>
  #include <linux/memblock.h>
  #include <linux/seq_file.h>
-#include <linux/bootmem.h>
  #include <linux/clkdev.h>
  #include <linux/initrd.h>
  #include <linux/kernel.h>
diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c

index 3383df8b35085c817deb7d3c70f82da224276a97..af5ada0520bea716b306209448e3235deb830ac6 100644 (file)
--- a/arch/c6x/mm/init.c
+++ b/arch/c6x/mm/init.c
@@ -11,7 +11,7 @@
  #include <linux/mm.h>
  #include <linux/swap.h>
  #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #ifdef CONFIG_BLK_DEV_RAM
  #include <linux/blkdev.h>
  #endif
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c

index 34e2df5c0d6d8724509cdbacab72c9914397fa2d..b32bfa1fe99e5c56aedd9923f2f49c2807d180ce 100644 (file)
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -18,7 +18,6 @@
  #include <linux/console.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-#include <linux/bootmem.h>
  #include <linux/seq_file.h>
  #include <linux/init.h>
  #include <linux/of.h>
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c

index f2bf4487aabdf69b978b3bfd1f5a26b3d688d147..6519252ac4dbd7669ca5ebc95930e91773d4f397 100644 (file)
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c
@@ -30,7 +30,7 @@
  #include <linux/init.h>
  #include <linux/highmem.h>
  #include <linux/pagemap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/gfp.h>
  
  #include <asm/setup.h>
diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c

index 70669937444483bd2a9be4b0a0a1956cc65ff604..38eaa7b703e7d05a939b032c051111b413c5d4b4 100644 (file)
--- a/arch/hexagon/kernel/dma.c
+++ b/arch/hexagon/kernel/dma.c
@@ -19,7 +19,7 @@
   */
  
  #include <linux/dma-noncoherent.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/genalloc.h>
  #include <linux/module.h>
  #include <asm/page.h>
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c

index dc8c7e75b5d1121ac9e6febce5e341a45778b59f..b3c3e04d4e5718ef61748a12172efec78e0354a4 100644 (file)
--- a/arch/hexagon/kernel/setup.c
+++ b/arch/hexagon/kernel/setup.c
@@ -20,7 +20,7 @@
  
  #include <linux/init.h>
  #include <linux/delay.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mmzone.h>
  #include <linux/mm.h>
  #include <linux/seq_file.h>
diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c

index 88643faf39813749bb3cb6f6492f6b29ba141105..1719ede9e9bde102b66432d66e65bc462d5e6e15 100644 (file)
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c
@@ -20,7 +20,6 @@
  
  #include <linux/init.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <asm/atomic.h>
  #include <linux/highmem.h>
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c

index 39f4433a6f0e2dba8bcd0a46985b4b53832f0d87..bec762a9b418d3a52d12a9ebe890ad103c8ba8fb 100644 (file)
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -12,7 +12,7 @@
  #include <linux/smp.h>
  #include <linux/delay.h>
  #include <linux/crash_dump.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/kexec.h>
  #include <linux/elfcore.h>
  #include <linux/sysctl.h>
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c

index f77d80edddfeb7d48dc85ffc9fad9454a60c5386..8f106638913c9bad4a7902969b2b6a59ddb8a2c5 100644 (file)
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -23,7 +23,7 @@
   *     Skip non-WB memory and ignore empty memory ranges.
   */
  #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/crash_dump.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c

index 6b51c88e357811ff6a3203dbc23140e39f2b2970..b49fe6f618edb1dc78f2bd371998b56613b56ede 100644 (file)
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -6,7 +6,7 @@
  #ifdef CONFIG_VIRTUAL_MEM_MAP
  #include <linux/compiler.h>
  #include <linux/export.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  EXPORT_SYMBOL(min_low_pfn);    /* defined by bootmem.c, but not exported by generic code */
  EXPORT_SYMBOL(max_low_pfn);    /* defined by bootmem.c, but not exported by generic code */
  #endif
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c

index 550243a94b5dbc13a0ab5cf793e3df749f4a29de..fe6e4946672e5ac21aadba499614d14a37e5ebdf 100644 (file)
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -90,7 +90,7 @@
  #include <linux/slab.h>
  #include <linux/smp.h>
  #include <linux/string.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/delay.h>
  #include <asm/hw_irq.h>
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c

index 71209766c47fe9b268d1e41ce32a2859cbdbc4f6..9a6603f8e409d6245ce921cd6679378a17678962 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -77,7 +77,7 @@
  #include <linux/sched/task.h>
  #include <linux/interrupt.h>
  #include <linux/irq.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/acpi.h>
  #include <linux/timer.h>
  #include <linux/module.h>
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c

index dfe40cbdf3b39a70b3812eaa65484618634e7575..45f956ad715a21d109ce2f61c07ae4c80843844e 100644 (file)
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -14,7 +14,7 @@
  #include <linux/interrupt.h>
  #include <linux/irq.h>
  #include <linux/kallsyms.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/acpi.h>
  #include <linux/timer.h>
  #include <linux/module.h>
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c

index 0e6c2d9fb49876b6e7147151eec5cbb458c4231b..583a3746d70be85de588b3dc64355cb85b389e61 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -27,7 +27,6 @@
  #include <linux/init.h>
  
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
  #include <linux/console.h>
  #include <linux/delay.h>
  #include <linux/cpu.h>
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c

index 74fe317477e6273b48d0b97f29d96aeda7ba7872..51ec944b036c438c400a9325f864168e56210915 100644 (file)
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -24,7 +24,7 @@
  
  #include <linux/module.h>
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/cpu.h>
  #include <linux/delay.h>
  #include <linux/init.h>
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c

index 9b820f7a6a989704e4ffbd25cdfc5a247f85f341..e311ee13e61d01536e79c431b2a830db93230a06 100644 (file)
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -19,7 +19,7 @@
  #include <linux/node.h>
  #include <linux/slab.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/nodemask.h>
  #include <linux/notifier.h>
  #include <linux/export.h>
diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c

index e04efa08890293779a4f2806ad5fc1144e40ef64..7601fe0622d25e26ee083b317d159479df16ddf0 100644 (file)
--- a/arch/ia64/kernel/unwind.c
+++ b/arch/ia64/kernel/unwind.c
@@ -28,7 +28,7 @@
   *       acquired, then the read-write lock must be acquired first.
   */
  #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/elf.h>
  #include <linux/kernel.h>
  #include <linux/sched.h>
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c

index 9e5c23a6b8b445d93c014f224a3fb7e217a275b5..6e447234205c6f94fe5b6d2d276c0eca22c0b9dd 100644 (file)
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -14,7 +14,6 @@
   * Routines used by ia64 machines with contiguous (or virtually contiguous)
   * memory.
   */
-#include <linux/bootmem.h>
  #include <linux/efi.h>
  #include <linux/memblock.h>
  #include <linux/mm.h>
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c

index 70609f823960ed54c032f3c2a4429d0281acb826..8a965784340c5c3616742fd01c30e3a0457b0092 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -19,7 +19,6 @@
  #include <linux/mm.h>
  #include <linux/nmi.h>
  #include <linux/swap.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/acpi.h>
  #include <linux/efi.h>
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c

index 43ea4a47163dbb704eb57c1d3aab0e73dc074175..d5e12ff1d73cf69f1350577d61f311b5081e8075 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -8,7 +8,6 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
  
-#include <linux/bootmem.h>
  #include <linux/efi.h>
  #include <linux/elf.h>
  #include <linux/memblock.h>
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c

index aa19b7ac8222a2fb604b90fc9edd3d3b86ef483c..3861d6e32d5ff910615305ef691b4a30fd1028f2 100644 (file)
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -15,7 +15,7 @@
  #include <linux/mm.h>
  #include <linux/node.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/module.h>
  #include <asm/mmzone.h>
  #include <asm/numa.h>
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c

index 5554863b4c9bac5f9b661a900e721eb85636340a..ab545daff7c372de29bb5ee41e672593e9cc3547 100644 (file)
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -21,7 +21,7 @@
  #include <linux/sched.h>
  #include <linux/smp.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/slab.h>
  
  #include <asm/delay.h>
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c

index 5d71800df4313a13970aa30d311740a118fe466b..196a0dd7ff97b0370cffc7dcecf101a18a0b7242 100644 (file)
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -20,7 +20,7 @@
  #include <linux/ioport.h>
  #include <linux/slab.h>
  #include <linux/spinlock.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  
  #include <asm/machvec.h>
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c

index 9146192b86f5532e44b681a807fe77fa84d55223..9900e6d4add60d6e3731401ec087da87b1f4be1a 100644 (file)
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -16,7 +16,7 @@
  #include <asm/nodedata.h>
  #include <asm/delay.h>
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/string.h>
  #include <linux/sched.h>
  #include <linux/slab.h>
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c

index 8b05d5581615731a1a6449d77e89094736324220..98f55220c67df0cbf5c3c69bde23c01a61d0edd0 100644 (file)
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -6,7 +6,7 @@
   * Copyright (C) 2006 Silicon Graphics, Inc. All rights reserved.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/slab.h>
  #include <asm/sn/types.h>
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c

index ab2564f95199ff97692aec76d279ac49e5990bca..71ad6b0ccab4f995c382046f1af5d44eda2a354f 100644 (file)
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -20,7 +20,7 @@
  #include <linux/mm.h>
  #include <linux/serial.h>
  #include <linux/irq.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mmzone.h>
  #include <linux/interrupt.h>
  #include <linux/acpi.h>
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c

index 1089d67df315966a83beaad7839cad6fc04ca7b2..6ffc204eb07dec522ac8e6eae286c86948590ed1 100644 (file)
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
  #include <linux/pagemap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mount.h>
  #include <linux/blkdev.h>
  #include <linux/module.h>
diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c

index adad03ca6e11956e606aa15c219fb4971ba73f52..360c723c0ae66a4784476138edfd7be21947f4ff 100644 (file)
--- a/arch/m68k/coldfire/m54xx.c
+++ b/arch/m68k/coldfire/m54xx.c
@@ -16,7 +16,7 @@
  #include <linux/io.h>
  #include <linux/mm.h>
  #include <linux/clk.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/pgalloc.h>
  #include <asm/machdep.h>
  #include <asm/coldfire.h>
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c

index 5d3596c180f9f75efab10fa416199e554fba3794..a1a3eaeaf58c960df8e406dca1fcdf0e434470a2 100644 (file)
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -20,7 +20,6 @@
  #include <linux/errno.h>
  #include <linux/string.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c

index cfd5475bfc3152aa0c47246db970d8468e4fa944..3c5def10d486e0a563d9034fefc93785c037c203 100644 (file)
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -27,7 +27,6 @@
  #include <linux/console.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/seq_file.h>
  #include <linux/init.h>
diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c

index 10708287706451e4d7801a1ad334e7523b3cc259..1b4c562753da898fd62972b02b785dafc38528a6 100644 (file)
--- a/arch/m68k/kernel/uboot.c
+++ b/arch/m68k/kernel/uboot.c
@@ -16,7 +16,7 @@
  #include <linux/console.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/seq_file.h>
  #include <linux/init.h>
  #include <linux/initrd.h>
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c

index ae49ae4d30494aed7dfee567f1d8df0e1e81c443..933c33e76a4831a2148115025009e2ed57d34341 100644 (file)
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -17,7 +17,7 @@
  #include <linux/string.h>
  #include <linux/types.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/gfp.h>
  
  #include <asm/setup.h>
diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c

index 38a1d92dd555a40303c01d90d39f41a804d5e02b..0de4999a3810db9441b44251da67d537af90f682 100644 (file)
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -13,7 +13,6 @@
  #include <linux/mm.h>
  #include <linux/init.h>
  #include <linux/string.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  
  #include <asm/setup.h>
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c

index 2113eec8dbf9b7466a64e905c1f1e3c3a02a2878..7497cf30bf1cd41b51afd915a45b5b80fd9dd939 100644 (file)
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -18,7 +18,6 @@
  #include <linux/string.h>
  #include <linux/types.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/gfp.h>
  
diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c

index 19c05ab9824dd267e915db4046d0da8ea3ab7310..f736db48a2e1bad63ae15d0a1b30b86542b47d59 100644 (file)
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -16,7 +16,7 @@
  #include <linux/string.h>
  #include <linux/types.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/setup.h>
  #include <linux/uaccess.h>
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c

index 79a2bb85790615c308ecea9b2c3fdf9807054cbb..542c4404861c3827fc76821bfa25fbc7bb063528 100644 (file)
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -15,7 +15,7 @@
  #include <linux/tty.h>
  #include <linux/console.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/platform_device.h>
  
  #include <asm/oplib.h>
diff --git a/arch/m68k/sun3/dvma.c b/arch/m68k/sun3/dvma.c

index 5f92c72b05c31739b10116ca90b495da600415ac..a2c1c930489577ffdc7937715f07c2edd5fbd597 100644 (file)
--- a/arch/m68k/sun3/dvma.c
+++ b/arch/m68k/sun3/dvma.c
@@ -11,7 +11,7 @@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/list.h>
  #include <asm/page.h>
  #include <asm/pgtable.h>
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c

index d30da12a1702b5ef8779ebff8b295388aad4117b..582a1284059a90f92f192003f0ea6bd4a3a46d3e 100644 (file)
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -13,7 +13,7 @@
  #include <linux/kernel.h>
  #include <linux/ptrace.h>
  #include <linux/delay.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/bitops.h>
  #include <linux/module.h>
  #include <linux/sched/mm.h>
diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c

index 72d94585b52e81df0f5492eb483e0c4901bce79b..8be8b750c6293d8857b43dcdb9a61cf76950f6cf 100644 (file)
--- a/arch/m68k/sun3/sun3dvma.c
+++ b/arch/m68k/sun3/sun3dvma.c
@@ -7,7 +7,7 @@
   * Contains common routines for sun3/sun3x DVMA management.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c

index b2acbc862f60eb772bd43739804a10bcfc8bff42..89e630e6655579b61bcadeba1ae1c4a1f403de0c 100644 (file)
--- a/arch/m68k/sun3x/dvma.c
+++ b/arch/m68k/sun3x/dvma.c
@@ -15,7 +15,7 @@
  #include <linux/init.h>
  #include <linux/bitops.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/vmalloc.h>
  
  #include <asm/sun3x.h>
diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c

index d801cc5f5b95571a7f96a9f5303a8d8ecf0c84f2..45e0a1aa935739cfac59134560605531490cf561 100644 (file)
--- a/arch/microblaze/mm/consistent.c
+++ b/arch/microblaze/mm/consistent.c
@@ -28,7 +28,7 @@
  #include <linux/vmalloc.h>
  #include <linux/init.h>
  #include <linux/delay.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c

index 9989740d397a7e357eb3b9584ceac3e2b3e97e4b..8c14988f52f24b0d7878ee0d2b3aabf9c29deaea 100644 (file)
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -7,10 +7,9 @@
   * for more details.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/kernel.h>
-#include <linux/memblock.h>
  #include <linux/mm.h> /* mem_init */
  #include <linux/initrd.h>
  #include <linux/pagemap.h>
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c

index 2ffd171af8b60b463e408efc2ac69fb89e61a20c..6b89a66ec1a5fc99ea3cac05c79a19a3d1c6ab5b 100644 (file)
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -20,7 +20,7 @@
  #include <linux/pci.h>
  #include <linux/string.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mm.h>
  #include <linux/shmem_fs.h>
  #include <linux/list.h>
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c

index 0332f0514d0508913048522c76328ae6de7e0127..80390a9ec2643b73977b02e112c8dab0d7984ff0 100644 (file)
--- a/arch/mips/ar7/memory.c
+++ b/arch/mips/ar7/memory.c
@@ -16,7 +16,7 @@
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/mm.h>
  #include <linux/pfn.h>
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c

index 4c7a93f4039a0cba2a18504525ed9cd2e0c02389..9728abcb18face9269b806566058b3edb0c1cf49 100644 (file)
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -14,7 +14,7 @@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/err.h>
  #include <linux/clk.h>
  #include <linux/clk-provider.h>
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c

index 7019e2967009e98e6f6191c1e86969d4663a957f..77a836e661c9eea91bc7582dd6ed435f5aba8f90 100644 (file)
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -7,7 +7,7 @@
   */
  
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/smp.h>
  #include <asm/bootinfo.h>
  #include <asm/bmips.h>
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c

index 2be9caaa208530757af7ab41eaa6104c9a0616da..e28ee9a7cc7e2cfeb18211f1d3650464ba7d42a8 100644 (file)
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -9,7 +9,7 @@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/delay.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ioport.h>
  #include <linux/pm.h>
  #include <asm/bootinfo.h>
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c

index 6329c5f780d6cffd01bf90124e75339336386b21..1738a06396f9f693be2cecdc00d3b90c2a5aa4e3 100644 (file)
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -9,7 +9,7 @@
  
  #include <linux/init.h>
  #include <linux/bitops.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/clk-provider.h>
  #include <linux/ioport.h>
  #include <linux/kernel.h>
diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c

index c44c1a654471832f5b8020111fc5337f8bc2fd09..e8eb60ed99f2a8f877b0cdf2bc673e1ee643f40b 100644 (file)
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -11,7 +11,7 @@
   * Copyright (C) 2010 Cavium Networks, Inc.
   */
  #include <linux/dma-direct.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/swiotlb.h>
  #include <linux/types.h>
  #include <linux/init.h>
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c

index a2acc6454cf3df44415e1d5b1394af3b6d8c47b5..5073d2ed78bbb6e7ec790e1ad758957e8cea2561 100644 (file)
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
@@ -8,7 +8,7 @@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/types.h>
  
  #include <asm/addrspace.h>
diff --git a/arch/mips/emma/common/prom.c b/arch/mips/emma/common/prom.c

index cae42259d6da9cc49efd4ceb8bccdbad941fe3d0..675337b8a4a09c1481fc3dba607e7b65139cfcbc 100644 (file)
--- a/arch/mips/emma/common/prom.c
+++ b/arch/mips/emma/common/prom.c
@@ -22,7 +22,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
  #include <linux/sched.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/addrspace.h>
  #include <asm/bootinfo.h>
diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c

index dd9496f26e6a930ec748937466bb0a153cc2a399..429b7f8d2aeb4389eacb9d023e7d9a2bd38bcec2 100644 (file)
--- a/arch/mips/fw/arc/memory.c
+++ b/arch/mips/fw/arc/memory.c
@@ -17,7 +17,7 @@
  #include <linux/types.h>
  #include <linux/sched.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/swap.h>
  
  #include <asm/sgialib.h>
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c

index 0a0aaf39fd162e83d618f24361c7473fd2ac353c..4c41ed0a637e554dc81f97bfcc01482a9353dca6 100644 (file)
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -13,7 +13,7 @@
  #include <linux/export.h>
  #include <linux/errno.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/spinlock.h>
  #include <linux/gfp.h>
  #include <linux/dma-direct.h>
diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c

index 2c7288041a992f670fd4912be22d2ba6c359fbc2..81845ba04835bfe88353bed5437e71439dbb0b8b 100644 (file)
--- a/arch/mips/kernel/crash.c
+++ b/arch/mips/kernel/crash.c
@@ -3,7 +3,7 @@
  #include <linux/smp.h>
  #include <linux/reboot.h>
  #include <linux/kexec.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/crash_dump.h>
  #include <linux/delay.h>
  #include <linux/irq.h>
diff --git a/arch/mips/kernel/crash_dump.c b/arch/mips/kernel/crash_dump.c

index a8657d29c62e0e3f4f84853907544c61c5b38d4d..01b2bd95ba1f7cad0137f787cd29b977f85bcdf4 100644 (file)
--- a/arch/mips/kernel/crash_dump.c
+++ b/arch/mips/kernel/crash_dump.c
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0
  #include <linux/highmem.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/crash_dump.h>
  #include <linux/uaccess.h>
  #include <linux/slab.h>
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c

index 89950b7bf536b7fe30e04fc531677c6b3b8666ea..93b8e0b4332f7d50e6882a7b1adbf77f917b7999 100644 (file)
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -12,7 +12,7 @@
  #include <linux/export.h>
  #include <linux/errno.h>
  #include <linux/types.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/debugfs.h>
  #include <linux/of.h>
  #include <linux/of_fdt.h>
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c

index 31522d3bc8bf31a76f3ce7aaf7281c1b71385cc7..41c1683761bbd8cad6536e3b9585b09e2ee2121e 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -15,7 +15,6 @@
  #include <linux/export.h>
  #include <linux/screen_info.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/initrd.h>
  #include <linux/root_dev.h>
  #include <linux/highmem.h>
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c

index 623dc18f7f2f4cea0b9e58dfe64fbf1e7e2668b5..0f852e1b589193d43f9125cfbfa303d6b47c6fed 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -28,7 +28,6 @@
  #include <linux/smp.h>
  #include <linux/spinlock.h>
  #include <linux/kallsyms.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/interrupt.h>
  #include <linux/ptrace.h>
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c

index 0bef238d2c0c6fda901e5f20682a26cb33e217eb..6176b9acba950e7189c48752498a9bb79f3648ad 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -26,7 +26,7 @@
  #include <linux/moduleloader.h>
  #include <linux/interrupt.h>
  #include <linux/poll.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/mipsregs.h>
  #include <asm/mipsmtregs.h>
  #include <asm/cacheflush.h>
diff --git a/arch/mips/kvm/commpage.c b/arch/mips/kvm/commpage.c

index f43629979a0e59959db7f1732233ad2db538ca5d..5812e6145801f2ba88b1a17b0c4a56ced7596dbb 100644 (file)
--- a/arch/mips/kvm/commpage.c
+++ b/arch/mips/kvm/commpage.c
@@ -14,7 +14,7 @@
  #include <linux/err.h>
  #include <linux/vmalloc.h>
  #include <linux/fs.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/page.h>
  #include <asm/cacheflush.h>
  #include <asm/mmu_context.h>
diff --git a/arch/mips/kvm/dyntrans.c b/arch/mips/kvm/dyntrans.c

index f8e772564d74290d2c2043c36e2263db98c018ea..d77b61b3d6ee7e294e927ed588ef499003f5b438 100644 (file)
--- a/arch/mips/kvm/dyntrans.c
+++ b/arch/mips/kvm/dyntrans.c
@@ -16,7 +16,7 @@
  #include <linux/uaccess.h>
  #include <linux/vmalloc.h>
  #include <linux/fs.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/cacheflush.h>
  
  #include "commpage.h"
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c

index 4144bfaef137728f9143e4ec3d2ab0c5b0606a73..ec9ed23bca7fdeea33f0e66dc0dd1a86c655f64e 100644 (file)
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -15,7 +15,7 @@
  #include <linux/kvm_host.h>
  #include <linux/vmalloc.h>
  #include <linux/fs.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/random.h>
  #include <asm/page.h>
  #include <asm/cacheflush.h>
diff --git a/arch/mips/kvm/interrupt.c b/arch/mips/kvm/interrupt.c

index aa0a1a00faf650c5804eb3e9ff5445929d3d5582..7257e8b6f5a92c1ff9ba7449dccdb081cd762995 100644 (file)
--- a/arch/mips/kvm/interrupt.c
+++ b/arch/mips/kvm/interrupt.c
@@ -13,7 +13,7 @@
  #include <linux/err.h>
  #include <linux/vmalloc.h>
  #include <linux/fs.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/page.h>
  #include <asm/cacheflush.h>
  
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c

index f7ea8e21656b168fbd16a57a46851c0ab78b0129..1fcc4d149054f16a74c59288459cf112f0c4c18a 100644 (file)
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -18,7 +18,7 @@
  #include <linux/vmalloc.h>
  #include <linux/sched/signal.h>
  #include <linux/fs.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/fpu.h>
  #include <asm/page.h>
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c

index d984bd5c2ec5fa24c4e966311a2504962ffd4963..14d4c5e2b42fa5a2509528c0e4d738165df19ec6 100644 (file)
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -8,7 +8,7 @@
  
  #include <linux/export.h>
  #include <linux/clk.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/of_fdt.h>
  
  #include <asm/bootinfo.h>
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c

index 37b8fc5b9ac9e82da57918d6eff5e0872d276e72..5ce1407de2d592861fb95d172aef46ef3017a77e 100644 (file)
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c
@@ -8,7 +8,7 @@
  #include <linux/ctype.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ioport.h>
  #include <asm/bootinfo.h>
  #include <asm/lasat/lasat.h>
diff --git a/arch/mips/loongson64/common/init.c b/arch/mips/loongson64/common/init.c

index 6ef17120722f55166cd97035b1e96956971ad5dc..c073fbcb9805b3e01853c888901bbd012e6aa6a7 100644 (file)
--- a/arch/mips/loongson64/common/init.c
+++ b/arch/mips/loongson64/common/init.c
@@ -8,7 +8,7 @@
   * option) any later version.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/bootinfo.h>
  #include <asm/traps.h>
  #include <asm/smp-ops.h>
diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c

index 703ad4536fe084268e8983f3d4fdeb414f9f7729..622761878cd11bd54e53affa43e5504c0aadc9c0 100644 (file)
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
@@ -18,7 +18,6 @@
  #include <linux/nodemask.h>
  #include <linux/swap.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/pfn.h>
  #include <linux/highmem.h>
  #include <asm/page.h>
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c

index 0893b6136498ea7dca464d5f105be3a5d6730285..b521d8e2d3592e7eec7610c495ab5738544ef9a3 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -22,7 +22,7 @@
  #include <linux/ptrace.h>
  #include <linux/mman.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/swap.h>
  #include <linux/proc_fs.h>
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c

index b19a3c506b1e9d203cbacb0da71513d8f21868b1..e2a33adc0f29d0ba786af3c4fa142be2ef1df28c 100644 (file)
--- a/arch/mips/mm/pgtable-32.c
+++ b/arch/mips/mm/pgtable-32.c
@@ -7,7 +7,7 @@
   */
  #include <linux/init.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <asm/fixmap.h>
  #include <asm/pgtable.h>
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c

index a47556723b8543f82558524cc9165513f65c6fde..868921adef1d76819452f1ee06d5c317212971e4 100644 (file)
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -12,7 +12,7 @@
   *          Steven J. Hill <sjhill@mips.com>
   */
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/string.h>
  
  #include <asm/bootinfo.h>
diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c

index b5ba83f4c646b3b48598e5cce482b8c1a49f7d9a..c856f2a3ea4244616e2a2b0fbb853defdd1801e6 100644 (file)
--- a/arch/mips/netlogic/xlp/dt.c
+++ b/arch/mips/netlogic/xlp/dt.c
@@ -33,7 +33,7 @@
   */
  
  #include <linux/kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <linux/of_fdt.h>
  #include <linux/of_platform.h>
diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c

index 3c3b1e6abb53562fd0508d7ac25ddb0b09891525..687513880fbf965c690a5044146947b9b20e83c5 100644 (file)
--- a/arch/mips/pci/pci-legacy.c
+++ b/arch/mips/pci/pci-legacy.c
@@ -11,7 +11,7 @@
  #include <linux/bug.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/init.h>
  #include <linux/types.h>
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c

index c2e94cf5ecdab7c7f3263bd65e76c30cf8eb32fc..e68b44b27c0dfc8d3ee22b0b5a3388f7de426279 100644 (file)
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -11,7 +11,7 @@
  #include <linux/bug.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/init.h>
  #include <linux/types.h>
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c

index 1ada8492733b6018766d8a5c1e68cc633133b818..d544e7b07f7ad454b72f2ab667c04995e0f4bacd 100644 (file)
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -14,7 +14,7 @@
  #include <linux/sizes.h>
  #include <linux/of_fdt.h>
  #include <linux/kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/of_platform.h>
  #include <linux/of_address.h>
  
diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c

index 6484e4a4597bdf3ac570b475ef3bb8e5b8d57ecc..361a690facbf6cf87fde1ac897bb79d91ee7d2bc 100644 (file)
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -29,7 +29,7 @@
  #include <linux/export.h>
  #include <linux/string.h>
  #include <linux/console.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ioport.h>
  #include <linux/blkdev.h>
  
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c

index cb1f1a6a166d0cd9019a9278cee18753ab323c59..d8b8444d679527e3843ea1de091be70926355f34 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -18,7 +18,6 @@
  #include <linux/export.h>
  #include <linux/nodemask.h>
  #include <linux/swap.h>
-#include <linux/bootmem.h>
  #include <linux/pfn.h>
  #include <linux/highmem.h>
  #include <asm/page.h>
diff --git a/arch/mips/sibyte/common/cfe.c b/arch/mips/sibyte/common/cfe.c

index 092fb2a6ec4a04415bb6ed72db53552ede93da35..12a780f251e16c2afd2da9aad6aa80a067a4b538 100644 (file)
--- a/arch/mips/sibyte/common/cfe.c
+++ b/arch/mips/sibyte/common/cfe.c
@@ -21,7 +21,7 @@
  #include <linux/linkage.h>
  #include <linux/mm.h>
  #include <linux/blkdev.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/pm.h>
  #include <linux/smp.h>
  
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c

index 152ca71cc2d7b97a6c17a4f4aa7cb3fdd7dd7ad8..3b034b7178d6f106ef116d8ad704a59e50209b0e 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -23,7 +23,7 @@
  
  #include <linux/spinlock.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/blkdev.h>
  #include <linux/init.h>
  #include <linux/kernel.h>
diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c

index bcb469247e8c4ffa024a616ab9f5154e9ef616a1..2b36a2ee744c1417b52db135a246e62bc85e1537 100644 (file)
--- a/arch/mips/txx9/rbtx4938/prom.c
+++ b/arch/mips/txx9/rbtx4938/prom.c
@@ -11,7 +11,7 @@
   */
  
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/bootinfo.h>
  #include <asm/txx9/generic.h>
  #include <asm/txx9/rbtx4938.h>
diff --git a/arch/nds32/kernel/setup.c b/arch/nds32/kernel/setup.c

index 63a1a5ef5219f47bcd9797e543298056294da22f..eacc79024879bad1d6948b4b872de78f6316befe 100644 (file)
--- a/arch/nds32/kernel/setup.c
+++ b/arch/nds32/kernel/setup.c
@@ -2,9 +2,8 @@
  // Copyright (C) 2005-2017 Andes Technology Corporation
  
  #include <linux/cpu.h>
-#include <linux/bootmem.h>
-#include <linux/seq_file.h>
  #include <linux/memblock.h>
+#include <linux/seq_file.h>
  #include <linux/console.h>
  #include <linux/screen_info.h>
  #include <linux/delay.h>
diff --git a/arch/nds32/mm/highmem.c b/arch/nds32/mm/highmem.c

index e17cb8a69315a05df7bd54435b9d71ba468bb72b..022779af6148ca671f32f8d080c57540ed0d4ee0 100644 (file)
--- a/arch/nds32/mm/highmem.c
+++ b/arch/nds32/mm/highmem.c
@@ -6,7 +6,7 @@
  #include <linux/sched.h>
  #include <linux/smp.h>
  #include <linux/interrupt.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/fixmap.h>
  #include <asm/tlbflush.h>
  
diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c

index 66d3e9cf498dce965d38ecbb51098846ba35793f..131104bd2538e5a919aa15b25f5bef8a7a2d671e 100644 (file)
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c
@@ -7,12 +7,11 @@
  #include <linux/errno.h>
  #include <linux/swap.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mman.h>
  #include <linux/nodemask.h>
  #include <linux/initrd.h>
  #include <linux/highmem.h>
-#include <linux/memblock.h>
  
  #include <asm/sections.h>
  #include <asm/setup.h>
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c

index a6d4f7530247b34897f54d4f7b882153619e4fdb..232a36b511aa9949810344c7ead8d4da1a14ccbb 100644 (file)
--- a/arch/nios2/kernel/prom.c
+++ b/arch/nios2/kernel/prom.c
@@ -25,7 +25,7 @@
  
  #include <linux/init.h>
  #include <linux/types.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/of.h>
  #include <linux/of_fdt.h>
  #include <linux/io.h>
diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c

index 2d0011ddd4d589392a525330de7c9cf01e494a44..6bbd4ae2beb01eab6386dc14f4c38f890558e056 100644 (file)
--- a/arch/nios2/kernel/setup.c
+++ b/arch/nios2/kernel/setup.c
@@ -16,7 +16,6 @@
  #include <linux/sched.h>
  #include <linux/sched/task.h>
  #include <linux/console.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/initrd.h>
  #include <linux/of_fdt.h>
diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c

index 12923501d94fed929ed262a36221cf0ef55d0453..16cea5776b87c6aa51101ea690f8a6401df191bb 100644 (file)
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c
@@ -23,7 +23,7 @@
  #include <linux/mm.h>
  #include <linux/init.h>
  #include <linux/pagemap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/binfmts.h>
  
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c

index e17fcd83120f6fadc97a149136f4a22b4d02113f..c605bdad1746ad25288b6b2e06de9641704e1f3f 100644 (file)
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -30,13 +30,12 @@
  #include <linux/delay.h>
  #include <linux/console.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/seq_file.h>
  #include <linux/serial.h>
  #include <linux/initrd.h>
  #include <linux/of_fdt.h>
  #include <linux/of.h>
-#include <linux/memblock.h>
  #include <linux/device.h>
  
  #include <asm/sections.h>
diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c

index 91a6a9ab7598de9f15140d58226577132bb71177..d157310eb377a7d574a03a386641b2fae46027cb 100644 (file)
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c
@@ -26,12 +26,11 @@
  #include <linux/mm.h>
  #include <linux/swap.h>
  #include <linux/smp.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/delay.h>
  #include <linux/blkdev.h>      /* for initrd_* */
  #include <linux/pagemap.h>
-#include <linux/memblock.h>
  
  #include <asm/segment.h>
  #include <asm/pgalloc.h>
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c

index 7e7a3126c5e9669f4750a4ec51bf4c0917a60797..2d7cffcaa476e13016abdd9b5deca4275d537614 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -14,7 +14,6 @@
  
  #include <linux/module.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/gfp.h>
  #include <linux/delay.h>
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c

index d39ec3a4550a26b2995e164bc0c3355346c9feb4..274bd1442dd91e29399ac432e5fcabe2c9b54722 100644 (file)
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -10,7 +10,7 @@
  #include <linux/capability.h>
  #include <linux/sched.h>
  #include <linux/errno.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/syscalls.h>
  #include <linux/irq.h>
  #include <linux/list.h>
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c

index 2b56d1f3038734508377eb59190b45068f5a9e9f..93ee3703b42f331e5e0706eefd3a3a0f347d0243 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -33,7 +33,6 @@
  #include <linux/serial_8250.h>
  #include <linux/percpu.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/of_platform.h>
  #include <linux/hugetlb.h>
  #include <asm/debugfs.h>
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c

index 9216c3a7fcfcd297bd7f0cf1c7bd13b8e93f5776..2a51e4cc8246d35d18d8ddd54b258af02dda47c4 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -29,10 +29,9 @@
  #include <linux/unistd.h>
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/pci.h>
  #include <linux/lockdep.h>
-#include <linux/memblock.h>
  #include <linux/memory.h>
  #include <linux/nmi.h>
  
diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c

index bf87d6e133699d18bd1447443af9ecb4c7b66f27..5b61704447c18bfb54920413ed27e2b60a0f9505 100644 (file)
--- a/arch/powerpc/lib/alloc.c
+++ b/arch/powerpc/lib/alloc.c
@@ -2,7 +2,7 @@
  #include <linux/types.h>
  #include <linux/init.h>
  #include <linux/slab.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/string.h>
  #include <asm/setup.h>
  
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c

index a7226ed9cae669dc4eb51137f8a8dec99fbc1bfd..8cf035e68378b70b99a49261bc02ef28cda026fd 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -15,7 +15,6 @@
  #include <linux/export.h>
  #include <linux/of_fdt.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/moduleparam.h>
  #include <linux/swap.h>
  #include <linux/swapops.h>
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c

index b3fe79064a692c3f7f5c53da3722b44a210852f7..0a64fffabee12d0969725292cb3666f16e5edb4d 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -27,12 +27,11 @@
  #include <linux/mm.h>
  #include <linux/stddef.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/initrd.h>
  #include <linux/pagemap.h>
  #include <linux/suspend.h>
-#include <linux/memblock.h>
  #include <linux/hugetlb.h>
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c

index 954f1986af4d45d4a48d6104b115f86a31a45654..67b9d7b669a134cc71a07b06e052cb873723978e 100644 (file)
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -44,7 +44,7 @@
  #include <linux/mm.h>
  #include <linux/init.h>
  #include <linux/spinlock.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/notifier.h>
  #include <linux/cpu.h>
  #include <linux/slab.h>
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c

index f04f15f9d232b6826f519c5b65e36f2341a22c71..3a048e98a13231b6ce8ec239d91e98fe1ed2d3a9 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -11,7 +11,7 @@
  #define pr_fmt(fmt) "numa: " fmt
  
  #include <linux/threads.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/mm.h>
  #include <linux/mmzone.h>
@@ -19,7 +19,6 @@
  #include <linux/nodemask.h>
  #include <linux/cpu.h>
  #include <linux/notifier.h>
-#include <linux/memblock.h>
  #include <linux/of.h>
  #include <linux/pfn.h>
  #include <linux/cpuset.h>
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c

index f45b369177a48543af10d019c1110b2c63ba0d94..f3391be7c762cb4f0fa1272c14bd77f4f00f986c 100644 (file)
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -18,7 +18,7 @@
  #include <linux/errno.h>
  #include <linux/adb.h>
  #include <linux/pmu.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/completion.h>
  #include <linux/spinlock.h>
  #include <asm/sections.h>
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c

index 23a67b545b701c8bb2ec3ba94e2e9a015c3a70ad..aba81cbf0b366e64f01daacd2888fbbbc2c0a215 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -17,11 +17,10 @@
  #include <linux/delay.h>
  #include <linux/string.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/irq.h>
  #include <linux/io.h>
  #include <linux/msi.h>
-#include <linux/memblock.h>
  #include <linux/iommu.h>
  #include <linux/rculist.h>
  #include <linux/sizes.h>
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c

index 12519857a33c5cb404c1952c332faafc6bfdca11..658bfab3350b928493ce0bf2b435bc2d602923cd 100644 (file)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -24,7 +24,7 @@
  #include <linux/root_dev.h>
  #include <linux/console.h>
  #include <linux/export.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/machdep.h>
  #include <asm/firmware.h>
diff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c

index 349a9ff6ca5bf00156e3af1f61d753c091a527e8..2444feda831f4ee841acb4756a7a4467a02b8e20 100644 (file)
--- a/arch/powerpc/sysdev/msi_bitmap.c
+++ b/arch/powerpc/sysdev/msi_bitmap.c
@@ -12,7 +12,7 @@
  #include <linux/kernel.h>
  #include <linux/kmemleak.h>
  #include <linux/bitmap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <asm/msi_bitmap.h>
  #include <asm/setup.h>
  
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c

index d58c111099b31d7c5418ba65813cbacce56b4a64..1d9bfaff60bca8c703646428af3581f4607fe0ef 100644 (file)
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -13,9 +13,8 @@
  
  #include <linux/init.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/initrd.h>
  #include <linux/memblock.h>
+#include <linux/initrd.h>
  #include <linux/swap.h>
  #include <linux/sizes.h>
  
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c

index d17566a8c76fb2a7c2418d437846662f59dc38b8..97eae387186875ea834c635d0608e49658bf355a 100644 (file)
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -13,10 +13,9 @@
  #include <linux/mm.h>
  #include <linux/gfp.h>
  #include <linux/slab.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/elf.h>
  #include <asm/asm-offsets.h>
-#include <linux/memblock.h>
  #include <asm/os_info.h>
  #include <asm/elf.h>
  #include <asm/ipl.h>
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c

index 781c1053a7736b6746f71268d58efa46bb522aac..72dd23ef771b6bf22f77e71df22a40e05fbee2d5 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -34,7 +34,6 @@
  #include <linux/delay.h>
  #include <linux/init.h>
  #include <linux/initrd.h>
-#include <linux/bootmem.h>
  #include <linux/root_dev.h>
  #include <linux/console.h>
  #include <linux/kernel_stat.h>
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c

index 44f9a7d6450ba4bc25218f7060873fb792a9244a..f82b3d3c36e2d5620e4b8e6b363936bcdf38d673 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -20,7 +20,7 @@
  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
  
  #include <linux/workqueue.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -35,7 +35,6 @@
  #include <linux/sched/hotplug.h>
  #include <linux/sched/task_stack.h>
  #include <linux/crash_dump.h>
-#include <linux/memblock.h>
  #include <linux/kprobes.h>
  #include <asm/asm-offsets.h>
  #include <asm/diag.h>
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c

index 799a91882a76c34f9426dbd02be6e63ec55d9556..8992b04c0adea6329299e30c4aaf8013a94b2de1 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -8,7 +8,7 @@
  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
  
  #include <linux/workqueue.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/uaccess.h>
  #include <linux/sysctl.h>
  #include <linux/cpuset.h>
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c

index ec31b48a42a52798bf31d5b55a7ef566b0ab3766..ebe748a9f472fde63cfccd42921472233f6ea529 100644 (file)
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -18,7 +18,7 @@
  #include <linux/user.h>
  #include <linux/elf.h>
  #include <linux/security.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/compat.h>
  #include <asm/asm-offsets.h>
  #include <asm/pgtable.h>
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c

index 84111a43ea2932055fd3e6281eb2289a697da5c2..eba2def3414dc5d0a78b3209ab2569522a9f094e 100644 (file)
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -16,7 +16,7 @@
  #include <linux/list.h>
  #include <linux/slab.h>
  #include <linux/export.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ctype.h>
  #include <linux/ioport.h>
  #include <asm/diag.h>
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c

index 873f6ee1c46dee1c4508bc0a2ca283f19180c118..76d0708438e9b8d9c4dcabd5b280caceafb2bfb0 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -21,7 +21,7 @@
  #include <linux/smp.h>
  #include <linux/init.h>
  #include <linux/pagemap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/memory.h>
  #include <linux/pfn.h>
  #include <linux/poison.h>
@@ -29,7 +29,6 @@
  #include <linux/export.h>
  #include <linux/cma.h>
  #include <linux/gfp.h>
-#include <linux/memblock.h>
  #include <asm/processor.h>
  #include <linux/uaccess.h>
  #include <asm/pgtable.h>
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c

index 04638b0b9ef10d615c07f1d70024c24cf5c5bfb1..0472e27febdfaa620cf4cd5849690907486d1136 100644 (file)
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -4,14 +4,13 @@
   *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/pfn.h>
  #include <linux/mm.h>
  #include <linux/init.h>
  #include <linux/list.h>
  #include <linux/hugetlb.h>
  #include <linux/slab.h>
-#include <linux/memblock.h>
  #include <asm/cacheflush.h>
  #include <asm/pgalloc.h>
  #include <asm/pgtable.h>
diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c

index 5a381fc8e9582d7f0742e6a01502b0ddddf54b3d..bfba273c32c01ae70497f4cf32c1c8a28b17179a 100644 (file)
--- a/arch/s390/numa/mode_emu.c
+++ b/arch/s390/numa/mode_emu.c
@@ -22,7 +22,6 @@
  #include <linux/kernel.h>
  #include <linux/cpumask.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/node.h>
  #include <linux/memory.h>
  #include <linux/slab.h>
diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c

index 297f5d8b0890729709e5023bd0b6ae69ba13b9c7..ae0d9e889534cd880f750845fb58d919080e9325 100644 (file)
--- a/arch/s390/numa/numa.c
+++ b/arch/s390/numa/numa.c
@@ -13,7 +13,6 @@
  #include <linux/kernel.h>
  #include <linux/mmzone.h>
  #include <linux/cpumask.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/node.h>
diff --git a/arch/s390/numa/toptree.c b/arch/s390/numa/toptree.c

index 7f61cc3fd4d1665521d12b994a8674e046565e45..71a608cd4f6124ded785897f2aba031b88ea0772 100644 (file)
--- a/arch/s390/numa/toptree.c
+++ b/arch/s390/numa/toptree.c
@@ -8,7 +8,7 @@
   */
  
  #include <linux/kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/cpumask.h>
  #include <linux/list.h>
  #include <linux/list_sort.h>
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c

index 21447f866415d4e889238f96b8770de58d3cd904..c8c13c777162c42ce5c189b1ff0c8c71806796e0 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -11,12 +11,11 @@
  #include <linux/swap.h>
  #include <linux/init.h>
  #include <linux/gfp.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/proc_fs.h>
  #include <linux/pagemap.h>
  #include <linux/percpu.h>
  #include <linux/io.h>
-#include <linux/memblock.h>
  #include <linux/dma-mapping.h>
  #include <linux/export.h>
  #include <asm/mmu_context.h>
diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c

index 927a1294c465f88dbd245c7ad45f9ce16c2d28dd..07e744d75fa01bba1137ffc105a42ebb2d1242c1 100644 (file)
--- a/arch/sh/mm/ioremap_fixed.c
+++ b/arch/sh/mm/ioremap_fixed.c
@@ -14,7 +14,7 @@
  #include <linux/module.h>
  #include <linux/mm.h>
  #include <linux/io.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/proc_fs.h>
  #include <asm/fixmap.h>
  #include <asm/page.h>
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c

index a41526bd91e23751db6fb024be3f9e4c29c1a0d4..9a26b442f820c86b5df5cfd13efd309dea3d59cc 100644 (file)
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -5,13 +5,11 @@
   */
  #include <linux/kernel.h>
  #include <linux/types.h>
-#include <linux/memblock.h>
  #include <linux/log2.h>
  #include <linux/list.h>
  #include <linux/slab.h>
  #include <linux/mm.h>
  #include <linux/miscdevice.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/refcount.h>
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c

index 4389944735c68fce36c1507c8e63280a9a412886..d41e2a749c5d94668876b0d92ac4963954696699 100644 (file)
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -19,7 +19,7 @@
  #include <linux/types.h>
  #include <linux/string.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/prom.h>
  #include <asm/oplib.h>
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c

index de7c87b153fe2b584ff0ed0a3f46706fa67f15d4..cd2825cb84207c16b3cf82870a25877a5793ffee 100644 (file)
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -32,7 +32,7 @@
  #include <linux/initrd.h>
  #include <linux/module.h>
  #include <linux/start_kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/io.h>
  #include <asm/processor.h>
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c

index 6cc80d0f4b9fb01215fbf010c099b886b83ce1b3..4792e08ad36b0116f5bb4948d1deb0e19ca30405 100644 (file)
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -22,7 +22,7 @@
  #include <linux/cache.h>
  #include <linux/jiffies.h>
  #include <linux/profile.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/vmalloc.h>
  #include <linux/ftrace.h>
  #include <linux/cpu.h>
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c

index 880714565c40af3096b6fe69edf1d5a6a601bc0d..d900952bfc5f3b0da140e722025f9aea21bfcef4 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -22,7 +22,6 @@
  #include <linux/initrd.h>
  #include <linux/init.h>
  #include <linux/highmem.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/pagemap.h>
  #include <linux/poison.h>
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c

index a8c3453195e63e4ec42c5404c62cc5348a405835..3c8aac21f4260bd9227849a4fdc6f93820aa49e8 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -11,7 +11,7 @@
  #include <linux/sched.h>
  #include <linux/string.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mm.h>
  #include <linux/hugetlb.h>
  #include <linux/initrd.h>
@@ -25,7 +25,6 @@
  #include <linux/sort.h>
  #include <linux/ioport.h>
  #include <linux/percpu.h>
-#include <linux/memblock.h>
  #include <linux/mmzone.h>
  #include <linux/gfp.h>
  
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c

index b48fea5ad9ef235829d48aef709355fe9649c719..a6142c5abf6141e468331e64b85d6aee1a5a5d30 100644 (file)
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -11,7 +11,7 @@
  
  #include <linux/seq_file.h>
  #include <linux/spinlock.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/pagemap.h>
  #include <linux/vmalloc.h>
  #include <linux/kdebug.h>
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c

index ef19a391214f397953f8d8057292a703b631aef4..673816880cce3454f50c4f35e1589b53728eeb70 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -6,7 +6,7 @@
   * Licensed under the GPL.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/etherdevice.h>
  #include <linux/ethtool.h>
  #include <linux/inetdevice.h>
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c

index 20442d20bd094a105cc3ece0ea4806c359b3e086..2b4dded11a7a2fbac27bb89ed5ce236cc5fbf9f8 100644 (file)
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -9,7 +9,7 @@
   */
  
  #include <linux/version.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/etherdevice.h>
  #include <linux/ethtool.h>
  #include <linux/inetdevice.h>
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c

index 844056cf313e4661f7d5fd766e3d1c3b1f354a9f..3678f5b05e427f8699eabbee586a751426d2dd8c 100644 (file)
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -4,7 +4,7 @@
   */
  
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/initrd.h>
  #include <asm/types.h>
  #include <init.h>
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c

index 2c672a8f457110796abb9a6f3743d2734cd6aa5d..1067469ba2ea54acf89c7ccbe3e4dbd21e2f952e 100644 (file)
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -5,7 +5,6 @@
  
  #include <linux/stddef.h>
  #include <linux/module.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/mm.h>
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c

index 296a91a04598b390bff809e0c178be89e4542d4f..5bf56af4d5b9522f2b1284236a516a39dcd37581 100644 (file)
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -4,7 +4,6 @@
   */
  
  #include <linux/module.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/mm.h>
  #include <linux/pfn.h>
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c

index 9969ec374abb345abcad9ffd5742f155fae36d37..29b71c68eb7cbcdefde8cd37dcd879895757ab29 100644 (file)
--- a/arch/unicore32/kernel/hibernate.c
+++ b/arch/unicore32/kernel/hibernate.c
@@ -13,7 +13,7 @@
  
  #include <linux/gfp.h>
  #include <linux/suspend.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c

index 9f163f976315d29c1b1acbb1775da0608d34e966..b2c38b32ea57d497d67bc9dc91d8933dd8d3e933 100644 (file)
--- a/arch/unicore32/kernel/setup.c
+++ b/arch/unicore32/kernel/setup.c
@@ -17,7 +17,7 @@
  #include <linux/utsname.h>
  #include <linux/initrd.h>
  #include <linux/console.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/seq_file.h>
  #include <linux/screen_info.h>
  #include <linux/init.h>
@@ -27,7 +27,6 @@
  #include <linux/smp.h>
  #include <linux/fs.h>
  #include <linux/proc_fs.h>
-#include <linux/memblock.h>
  #include <linux/elf.h>
  #include <linux/io.h>
  
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c

index 44fd0e8fbe87d58ba3c4b43364953b1df17d45dc..cf4eb9481fd667358c73f65178b4ee5039f232ec 100644 (file)
--- a/arch/unicore32/mm/init.c
+++ b/arch/unicore32/mm/init.c
@@ -11,13 +11,12 @@
  #include <linux/errno.h>
  #include <linux/swap.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mman.h>
  #include <linux/nodemask.h>
  #include <linux/initrd.h>
  #include <linux/highmem.h>
  #include <linux/gfp.h>
-#include <linux/memblock.h>
  #include <linux/sort.h>
  #include <linux/dma-mapping.h>
  #include <linux/export.h>
diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c

index 18b355a20f0bb3209ccfff0f5a0274531d820125..040a8c279761d827a7546960552061ce40cb875c 100644 (file)
--- a/arch/unicore32/mm/mmu.c
+++ b/arch/unicore32/mm/mmu.c
@@ -17,7 +17,6 @@
  #include <linux/nodemask.h>
  #include <linux/memblock.h>
  #include <linux/fs.h>
-#include <linux/bootmem.h>
  #include <linux/io.h>
  
  #include <asm/cputype.h>
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c

index f5ea6415b77819ecb30a3f98bf5e39b940a644bc..7f5d212551d4dcea8b2ec28ea8b7971ecbbdf0c0 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -32,7 +32,7 @@
  #include <linux/dmi.h>
  #include <linux/irq.h>
  #include <linux/slab.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ioport.h>
  #include <linux/pci.h>
  #include <linux/efi-bgrt.h>
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c

index f1915b7440522a82642a0b3369df1a570d8c834a..ca13851f05701387d5faa8bc57eb04fd9b513a9a 100644 (file)
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -7,7 +7,6 @@
   */
  
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/dmi.h>
  #include <linux/cpumask.h>
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c

index ab731ab09f06d1cff436f3b94cb363fb6c271e7b..32b2b7a41ef5d37d7bad942435341a15fa046aba 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -20,7 +20,7 @@
  #include <linux/acpi_pmtmr.h>
  #include <linux/clockchips.h>
  #include <linux/interrupt.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ftrace.h>
  #include <linux/ioport.h>
  #include <linux/export.h>
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c

index 8c7450900e0ecb1afce427ed4f606e2ca186ceda..5fbc57e4b0b9b4606fa866b06a699805536762db 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -47,7 +47,7 @@
  #include <linux/kthread.h>
  #include <linux/jiffies.h>     /* time_after() */
  #include <linux/slab.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/irqdomain.h>
  #include <asm/io.h>
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c

index 660d0b22e962e83b1026743d37f1194d95ed46e0..cbbd57ae06ee2af4b1028c95462209a2c348306f 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1,7 +1,7 @@
  /* cpu_feature_enabled() cannot be used this early */
  #define USE_EARLY_PGTABLE_L5
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/linkage.h>
  #include <linux/bitops.h>
  #include <linux/kernel.h>
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c

index a0ec4c37265a7c52cc6821ad3ee55108c0135506..68ff62bffbabe089fcfa5049162fa0b4533683aa 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -9,11 +9,10 @@
   * allocation code routines via a platform independent interface (memblock, etc.).
   */
  #include <linux/crash_dump.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/suspend.h>
  #include <linux/acpi.h>
  #include <linux/firmware-map.h>
-#include <linux/memblock.h>
  #include <linux/sort.h>
  
  #include <asm/e820/api.h>
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c

index f1c5eb99d445407a9fc134e76a8010d17a61d780..3482460d984d0395830c6227a39e639a5aa87b07 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -11,7 +11,6 @@
  #include <linux/mm.h>
  #include <linux/init.h>
  #include <linux/delay.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/kernel_stat.h>
  #include <linux/mc146818rtc.h>
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c

index 7ba73fe0d917de810abf81b3f344f2b68fa2c491..f4562fcec6815baaef955da689b01942d4995347 100644 (file)
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -3,7 +3,7 @@
  #include <linux/dma-debug.h>
  #include <linux/dmar.h>
  #include <linux/export.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/gfp.h>
  #include <linux/pci.h>
  
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c

index 71c0b01d93b1b3d1befa524c31ecc88ae65f0b82..bd08b9e1c9e2a641209805b96c502eeb6523acdc 100644 (file)
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -5,7 +5,7 @@
  #include <linux/cache.h>
  #include <linux/init.h>
  #include <linux/swiotlb.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/dma-direct.h>
  #include <linux/mem_encrypt.h>
  
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c

index 637982efecd80cbee7964f3473367cbfbd96191d..9b158b4716d29cc5f87f338b73ff7f39b58e4830 100644 (file)
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
@@ -20,7 +20,7 @@
  #include <linux/notifier.h>
  #include <linux/sched.h>
  #include <linux/gfp.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/nmi.h>
  
  #include <asm/fixmap.h>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c

index 7005f89bf3b22f21b7952c6f5a97951fc61045ec..b74e7bfed6ab40826b782f495324e2782963abb4 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -30,7 +30,6 @@
  #include <linux/sfi.h>
  #include <linux/apm_bios.h>
  #include <linux/initrd.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/seq_file.h>
  #include <linux/console.h>
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c

index 483412fb8a24d6b92db64000fc92429b5c4ba576..e8796fcd7e5a5ec2be8608a7c43ba78fc34b4e6f 100644 (file)
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -4,7 +4,6 @@
  #include <linux/kernel.h>
  #include <linux/export.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/percpu.h>
  #include <linux/kexec.h>
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c

index 5369d7fac7978b9216c43c88931ab66e41a6fac6..a9134d1910b961d16fdbde13a71dd1aac6ffc28f 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -49,7 +49,7 @@
  #include <linux/sched/hotplug.h>
  #include <linux/sched/task_stack.h>
  #include <linux/percpu.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/err.h>
  #include <linux/nmi.h>
  #include <linux/tboot.h>
diff --git a/arch/x86/kernel/tce_64.c b/arch/x86/kernel/tce_64.c

index 75730ce01f8d6168f37db287c59dbe65c719a8e4..285aaa62d153686c2f91354102c68820405cc757 100644 (file)
--- a/arch/x86/kernel/tce_64.c
+++ b/arch/x86/kernel/tce_64.c
@@ -30,7 +30,6 @@
  #include <linux/string.h>
  #include <linux/pci.h>
  #include <linux/dma-mapping.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <asm/tce.h>
  #include <asm/calgary.h>
diff --git a/arch/x86/mm/amdtopology.c b/arch/x86/mm/amdtopology.c

index 048c761d97b09539830ad461a12fc1cb3b7f7674..058b2f36b3a6e07f59ca02b6ccba52280694993c 100644 (file)
--- a/arch/x86/mm/amdtopology.c
+++ b/arch/x86/mm/amdtopology.c
@@ -12,7 +12,6 @@
  #include <linux/string.h>
  #include <linux/nodemask.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  
  #include <asm/io.h>
  #include <linux/pci_ids.h>
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c

index b24eb4eb9984947ea8c5d1951c30e4207d5cbf1b..71d4b9d4d43fdb5efb31287e86aad436b82df654 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -8,7 +8,7 @@
  #include <linux/sched/task_stack.h>    /* task_stack_*(), ...          */
  #include <linux/kdebug.h>              /* oops_begin/end, ...          */
  #include <linux/extable.h>             /* search_exception_tables      */
-#include <linux/bootmem.h>             /* max_low_pfn                  */
+#include <linux/memblock.h>            /* max_low_pfn                  */
  #include <linux/kprobes.h>             /* NOKPROBE_SYMBOL, ...         */
  #include <linux/mmiotrace.h>           /* kmmio_handler, ...           */
  #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 62915a5e0fa256f5e81cc682740b7109805688ca..0d4bdcb84da5ab3519ab27402d907adda1abe3bc 100644 (file)
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -1,7 +1,7 @@
  #include <linux/highmem.h>
  #include <linux/export.h>
  #include <linux/swap.h> /* for totalram_pages */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  void *kmap(struct page *page)
  {
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c

index faca978ebf9d8b46b6437f908b9ae506d3489da2..ef99f3892e1faedbf96a935838c248c4801dbc2b 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -3,7 +3,6 @@
  #include <linux/ioport.h>
  #include <linux/swap.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>     /* for max_low_pfn */
  #include <linux/swapfile.h>
  #include <linux/swapops.h>
  
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c

index 3bbe5f58a67d5988077ebbc6d09c32addee40c34..49ecf5ecf6d329f82e11e2bf12a71fe739de3545 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -23,7 +23,6 @@
  #include <linux/pci.h>
  #include <linux/pfn.h>
  #include <linux/poison.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/proc_fs.h>
  #include <linux/memory_hotplug.h>
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c

index bfb0bedc21d3d0da790585f433d75f477cdc8d38..5fab264948c2a2d35b29136d66f24968b44ef7db 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -20,7 +20,6 @@
  #include <linux/init.h>
  #include <linux/initrd.h>
  #include <linux/pagemap.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/proc_fs.h>
  #include <linux/pci.h>
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c

index 24e0920a9b25f4e916dd82a42b92a1a5dd6ec2b5..5378d10f1d31d4887dabd469e535372e6ccc2196 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -6,7 +6,7 @@
   * (C) Copyright 1995 1996 Linus Torvalds
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/io.h>
  #include <linux/ioport.h>
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c

index 8f87499124b8011c3446c4070f4f059cec10d2b0..04a9cf6b034fe4ec8b0d451416a759e6c21ee051 100644 (file)
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -5,10 +5,9 @@
  /* cpu_feature_enabled() cannot be used this early */
  #define USE_EARLY_PGTABLE_L5
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/kasan.h>
  #include <linux/kdebug.h>
-#include <linux/memblock.h>
  #include <linux/mm.h>
  #include <linux/sched.h>
  #include <linux/sched/task.h>
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c

index 61db77b0eda9cecf9b71d38fde99d0febb5eb4ea..3f452ffed7e93f377aa1ae38150a1f2cf7e91a5c 100644 (file)
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -23,6 +23,7 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/random.h>
+#include <linux/memblock.h>
  
  #include <asm/pgalloc.h>
  #include <asm/pgtable.h>
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c

index 16e37d712ffd9482cab30ae777f58cd7fe0b2d09..1308f5408bf74881f89c5b323a465e23ac83177f 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -4,7 +4,6 @@
  #include <linux/mm.h>
  #include <linux/string.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/mmzone.h>
  #include <linux/ctype.h>
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c

index e8a4a09e20f178f7e420fab31b64cc16a02526e7..f2bd3d61e16bb2157ea227d9533fc4845cf1c79e 100644 (file)
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -22,7 +22,6 @@
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/init.h>
  
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c

index 066f3511d5f1fc29069c2a577466c6a1df1f8884..59d80160fa5a2d14b65b4e58ba1313498a1ad48c 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -3,7 +3,7 @@
   * Generic VM initialization for x86-64 NUMA setups.
   * Copyright 2002,2003 Andi Kleen, SuSE Labs.
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include "numa_internal.h"
  
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c

index b54d52a2d00a83a9fa4be8647fe3acf92b81c4c7..a80fdd7fb40f3b25791b2ab816ef068eb2f09170 100644 (file)
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -6,7 +6,6 @@
  #include <linux/errno.h>
  #include <linux/topology.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <asm/dma.h>
  
  #include "numa_internal.h"
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c

index a25588ad75efef495c4abb9778439da2f7e64a5d..08f8f76a48527b475a5773f9c13488740872c888 100644 (file)
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -5,7 +5,7 @@
   * Clears the a test pte bit on random pages in the direct mapping,
   * then reverts and compares page tables forwards and afterwards.
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/kthread.h>
  #include <linux/random.h>
  #include <linux/kernel.h>
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c

index 62bb30b4bd2ab67de5607d27fd2d816f2c947c8a..f799076e3d577065e8c73c12c6cddb0c5d6f6cfe 100644 (file)
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -3,7 +3,7 @@
   * Thanks to Ben LaHaise for precious feedback.
   */
  #include <linux/highmem.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/sched.h>
  #include <linux/mm.h>
  #include <linux/interrupt.h>
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c

index 3d0c83ef6aab98cde354b86f999eecfca3a38263..08013524fba18ebe2afc44bf798c5ad77839fa0b 100644 (file)
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -8,7 +8,7 @@
   */
  
  #include <linux/seq_file.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/debugfs.h>
  #include <linux/ioport.h>
  #include <linux/kernel.h>
diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c

index 7f9acb68324ce3c61672f654be80a79b89661b44..bdc98150d4db887ecc43515bb60ae7dd19664ae3 100644 (file)
--- a/arch/x86/mm/physaddr.c
+++ b/arch/x86/mm/physaddr.c
@@ -1,5 +1,5 @@
  // SPDX-License-Identifier: GPL-2.0
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/mmdebug.h>
  #include <linux/export.h>
  #include <linux/mm.h>
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c

index ed4ac215305d02e578db31ec9ccfd281b1e607fc..8cd66152cdb0e897fd47200109f3928d04ee03d2 100644 (file)
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -32,7 +32,7 @@
  #include <linux/init.h>
  #include <linux/ioport.h>
  #include <linux/errno.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/pat.h>
  #include <asm/e820/api.h>
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c

index 9061babfbc83d73b59a1cddb7b954353e3f53c2d..7ae939e353cd97ba649db386a52e79d6cd515ecc 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -36,9 +36,8 @@
  #include <linux/efi.h>
  #include <linux/efi-bgrt.h>
  #include <linux/export.h>
-#include <linux/bootmem.h>
-#include <linux/slab.h>
  #include <linux/memblock.h>
+#include <linux/slab.h>
  #include <linux/spinlock.h>
  #include <linux/uaccess.h>
  #include <linux/time.h>
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c

index e8da7f492970add0d6c192e02028f0a3ad3794c3..cf0347f61b21c48e4a0507706121ec0b88ef7af5 100644 (file)
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -23,7 +23,7 @@
  #include <linux/mm.h>
  #include <linux/types.h>
  #include <linux/spinlock.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ioport.h>
  #include <linux/mc146818rtc.h>
  #include <linux/efi.h>
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c

index 4b70d0f5a803ff47fd16f8ab071380cb1e7de517..95e77a667ba5c99c89b9eeeb8a29691e930c4c07 100644 (file)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -8,7 +8,6 @@
  #include <linux/efi.h>
  #include <linux/slab.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/acpi.h>
  #include <linux/dmi.h>
  
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c

index 140cd76ee8976dfd70a36e6650c45edd9c6cc51d..115c8e4173bb1647756ba54cf7ebc8fae138982b 100644 (file)
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -17,7 +17,7 @@
   */
  
  #include <linux/kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/of.h>
  #include <linux/of_platform.h>
  #include <linux/of_pdt.h>
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c

index 15695e30f982e633ca7c74a605ff08927caec888..be15bdcb20df07105597e45a6491f62a3c2c0ab0 100644 (file)
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -8,7 +8,7 @@
  
  #include <linux/gfp.h>
  #include <linux/suspend.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c

index 67b2f31a1265f3d6db430974428f8cbdef56150d..e996e8e744cbab90ecaca0ea17f07048465e208b 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1,7 +1,7 @@
  // SPDX-License-Identifier: GPL-2.0
  
  #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #endif
  #include <linux/cpu.h>
  #include <linux/kexec.h>
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c

index ec7a4209f3107ea5c4063db67dfb07f30efa933f..2f6787fc710660aae1598c8e245d04101f77cb18 100644 (file)
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -23,7 +23,7 @@
  #include <linux/start_kernel.h>
  #include <linux/sched.h>
  #include <linux/kprobes.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/mm.h>
  #include <linux/page-flags.h>
@@ -31,7 +31,6 @@
  #include <linux/console.h>
  #include <linux/pci.h>
  #include <linux/gfp.h>
-#include <linux/memblock.h>
  #include <linux/edd.h>
  #include <linux/frame.h>
  
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c

index b3e11afed25bbbc3f6497240cef40a59b5cc12b6..b06731705529b1e4c339bc21db8de0a565acf6d8 100644 (file)
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -67,7 +67,6 @@
  #include <linux/hash.h>
  #include <linux/sched.h>
  #include <linux/seq_file.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c

index 21f13e9aabe1b5f660cdb54b5d077f31c08c8e34..5ca440a7431671628ee87e319da5ac23b42744b4 100644 (file)
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -24,7 +24,7 @@
  #include <linux/init.h>
  #include <linux/sched.h>
  #include <linux/errno.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <asm/pci-bridge.h>
  #include <asm/platform.h>
diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c

index 9220dcde7520cd79e0a7924d8f130a62a0b0866d..b27359e2a464c6836c23df0e5f48da25bc07ed01 100644 (file)
--- a/arch/xtensa/mm/cache.c
+++ b/arch/xtensa/mm/cache.c
@@ -21,7 +21,7 @@
  #include <linux/string.h>
  #include <linux/types.h>
  #include <linux/ptrace.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/swap.h>
  #include <linux/pagemap.h>
  
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c

index f7fbe63349392f3d31c5ac52dc5e1daf603d9216..9750a48f491b19c087b8b1013b4614eaf61e4cac 100644 (file)
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -18,7 +18,7 @@
  
  #include <linux/kernel.h>
  #include <linux/errno.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/gfp.h>
  #include <linux/highmem.h>
  #include <linux/swap.h>
diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c

index 1a30a258ccd04d873ebe48faedd630bc870c87ea..6b95ca43aec0f78cd1827824d84b4b3ee5507357 100644 (file)
--- a/arch/xtensa/mm/kasan_init.c
+++ b/arch/xtensa/mm/kasan_init.c
@@ -8,11 +8,10 @@
   * Copyright (C) 2017 Cadence Design Systems Inc.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init_task.h>
  #include <linux/kasan.h>
  #include <linux/kernel.h>
-#include <linux/memblock.h>
  #include <asm/initialize_mmu.h>
  #include <asm/tlbflush.h>
  #include <asm/traps.h>
diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c

index f33a1ff2662a3a95c3e7afc72ca69fa9fcedad8e..a4dcfd39bc5c1c54f170e83c405f51980a8e84f4 100644 (file)
--- a/arch/xtensa/mm/mmu.c
+++ b/arch/xtensa/mm/mmu.c
@@ -4,7 +4,7 @@
   *
   * Extracted from init.c
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/percpu.h>
  #include <linux/init.h>
  #include <linux/string.h>
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c

index 206b9d4591e89a9a34fca9821eb1502c6845e2c0..190846dddc675747c178a05e781474b93d7f3348 100644 (file)
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -30,7 +30,7 @@
  #include <linux/etherdevice.h>
  #include <linux/interrupt.h>
  #include <linux/ioctl.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/ethtool.h>
  #include <linux/rtnetlink.h>
  #include <linux/platform_device.h>
diff --git a/arch/xtensa/platforms/iss/setup.c b/arch/xtensa/platforms/iss/setup.c

index 58709e89a8ed1f41ed7acaad204d4d91e973386a..c14cc673976c32e5cb5de099bfa1c7ac8400260b 100644 (file)
--- a/arch/xtensa/platforms/iss/setup.c
+++ b/arch/xtensa/platforms/iss/setup.c
@@ -16,7 +16,7 @@
   * option) any later version.
   *
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/stddef.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
diff --git a/block/blk-settings.c b/block/blk-settings.c

index ffd459969689df0821bf377d1c433f039d502de1..696c04c1ab6c1f24a426345e2f13a9fc2f848e58 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -6,7 +6,7 @@
  #include <linux/init.h>
  #include <linux/bio.h>
  #include <linux/blkdev.h>
-#include <linux/bootmem.h>     /* for max_pfn/max_low_pfn */
+#include <linux/memblock.h>    /* for max_pfn/max_low_pfn */
  #include <linux/gcd.h>
  #include <linux/lcm.h>
  #include <linux/jiffies.h>
diff --git a/block/bounce.c b/block/bounce.c

index ec0d99995f5f0581ebe32928cc8e82acd8773e04..cf49fe02f65cd017eb2132fd3475ba29a5d3cf75 100644 (file)
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -18,7 +18,7 @@
  #include <linux/init.h>
  #include <linux/hash.h>
  #include <linux/highmem.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/printk.h>
  #include <asm/tlbflush.h>
  
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c

index 85167603b9c94318bcef7c260de689c13e4e4545..274699463b4f1eaf10bb01883434d870110a53e0 100644 (file)
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -27,7 +27,6 @@
  #include <linux/types.h>
  #include <linux/errno.h>
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/numa.h>
  #include <linux/nodemask.h>
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c

index a3d012b08fc5cc982e019f7049e90458012c8419..61203eebf3a1ae8cc3e70a7658b49cd39a8f249a 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -31,9 +31,8 @@
  #include <linux/irq.h>
  #include <linux/errno.h>
  #include <linux/acpi.h>
-#include <linux/bootmem.h>
-#include <linux/earlycpio.h>
  #include <linux/memblock.h>
+#include <linux/earlycpio.h>
  #include <linux/initrd.h>
  #include "internal.h"
  
diff --git a/drivers/base/platform.c b/drivers/base/platform.c

index 23cf4427f425cf12ad90fd38baeb9ae3a9d8e31d..41b91af95afbd31c2220981b7255b4460a03a3ce 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -16,7 +16,7 @@
  #include <linux/module.h>
  #include <linux/init.h>
  #include <linux/dma-mapping.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/err.h>
  #include <linux/slab.h>
  #include <linux/pm_runtime.h>
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c

index 5c54d3734daf96fbfca8415b83a5521cf5a6c20d..5b2867a33b98d76fd09862d5be7f953bd5fcd098 100644 (file)
--- a/drivers/clk/ti/clk.c
+++ b/drivers/clk/ti/clk.c
@@ -23,7 +23,7 @@
  #include <linux/of_address.h>
  #include <linux/list.h>
  #include <linux/regmap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/device.h>
  
  #include "clock.h"
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c

index f2483548cde92d692f748d6a9c7da0cbf98274a3..099d83e4e910e25146f5a22e67e854bd003cd687 100644 (file)
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -5,7 +5,7 @@
  #include <linux/ctype.h>
  #include <linux/dmi.h>
  #include <linux/efi.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/random.h>
  #include <asm/dmi.h>
  #include <asm/unaligned.h>
diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c

index 2b675f788b61d8eab47e128c4d8fd8409af19d21..ac1654f74dc77aa4952bb8feb6514acc5c412cf6 100644 (file)
--- a/drivers/firmware/efi/apple-properties.c
+++ b/drivers/firmware/efi/apple-properties.c
@@ -20,7 +20,7 @@
  
  #define pr_fmt(fmt) "apple-properties: " fmt
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/efi.h>
  #include <linux/io.h>
  #include <linux/platform_data/x86/apple.h>
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c

index 2224f1dc074b1329d7ce9c80b78bef4fffc6e98b..72d9ea18270b572102cc622ac15dc3ec1cfa0127 100644 (file)
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -18,7 +18,7 @@
   * GNU General Public License for more details.
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/blkdev.h>
  #include <linux/ctype.h>
  #include <linux/device.h>
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c

index 03cead6d5f9779fdf8413c01c888bd77a0bd5ce0..2a23453f005add9fab3d9bda7fb823b95d9b8f1e 100644 (file)
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -19,7 +19,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/types.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/mm.h>
  
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c

index f9f69f7111a91e99c1552e16533afac7d0d5f275..44bd5b9166bbfd2b6022ae22f20a88eae0058225 100644 (file)
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -11,7 +11,7 @@
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/bug.h>
  #include <linux/clk.h>
  #include <linux/component.h>
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c

index 676c029494e44cc4a8eaf9af26e47d5e9ba40e02..0e780848f59b6b41bb96859c3539c83e0939d322 100644 (file)
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -13,7 +13,7 @@
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
   */
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/bug.h>
  #include <linux/clk.h>
  #include <linux/component.h>
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c

index 0069f9084f9f1c1e22284d367d23a29a900c2061..880a81c82b7a98a9b96a83841acb6147a22f6d93 100644 (file)
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -23,7 +23,7 @@
  #include <linux/kernel.h>
  #include <linux/device.h>
  #include <linux/dmapool.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/vmalloc.h>
  #include <linux/highmem.h>
  #include <linux/jiffies.h>
@@ -38,7 +38,6 @@
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
  #include <linux/slab.h>
-#include <linux/memblock.h>
  #include <linux/sched/signal.h>
  
  #include <asm/byteorder.h>
diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c

index fc15ec58230a0d8fdfa6a0ad8d34206ee2c95ec3..0d33cf0842add6c8dbb05022dc44b8563b762377 100644 (file)
--- a/drivers/mtd/ar7part.c
+++ b/drivers/mtd/ar7part.c
@@ -25,7 +25,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/module.h>
  
  #include <uapi/linux/magic.h>
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c

index a07e24970be4216f16df473c80dab72b516ab11c..11c5bad95226698ab2888f2ad971220a2c5df8e4 100644 (file)
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -33,7 +33,7 @@
  #include <linux/ioport.h>
  #include <linux/delay.h>
  #include <linux/netdevice.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
  #include <linux/io.h>
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c

index 38fa60ddaf2ea0d2c8d3d0db15640c94035ae54b..28510e33924fbd7099f232a869c7715656eccc4e 100644 (file)
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -38,7 +38,7 @@
  #include <linux/netdevice.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/io.h>
  
  #include "arcdevice.h"
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c

index 4e56aaf2b9843cb633a10cf93c0a4242b270ce8f..2c546013a98014b4c83b759d293ed24f91b3c940 100644 (file)
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -34,7 +34,7 @@
  #include <linux/ioport.h>
  #include <linux/delay.h>
  #include <linux/netdevice.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
  #include <linux/io.h>
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c

index ffe62a7ae19b68055290ca57e90f06cf05b1ad2e..bb532aae0d92a080a0b9e9eb4369267b34af4710 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -11,7 +11,6 @@
  #include <linux/crc32.h>
  #include <linux/kernel.h>
  #include <linux/initrd.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/mutex.h>
  #include <linux/of.h>
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c

index 01e23b85e79824b9fddf397a518dc74b1b9a14c8..49ae2aa744d62207d57442d1d099e05c8869362b 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -5,7 +5,7 @@
  
  #define pr_fmt(fmt) "### dt-test ### " fmt
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/errno.h>
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c

index 16a4e8528bbc34198677f1e9f879790192fb4f33..8f3a2eeb28dca0b579d2d773057296e92f379342 100644 (file)
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -8,7 +8,7 @@
   *     Copyright IBM Corp. 2003, 2009
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/console.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c

index 5b8af278228282914a4250ee655aa4f85355ef7f..2b0c36c2c5688ebf6ef0266d66cad52793b7ae1b 100644 (file)
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -19,7 +19,7 @@
  #include <linux/workqueue.h>
  
  #include <linux/slab.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/compat.h>
  
  #include <asm/ccwdev.h>
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c

index 8af4948dae806d56e22fc16a913eb84f47b77cbc..72dd2471ec1ebdd97445f157261c7a373055a9bd 100644 (file)
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -13,7 +13,7 @@
  #define KMSG_COMPONENT "cio"
  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/device.h>
  #include <linux/init.h>
  #include <linux/list.h>
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c

index 8f5c1d7f751aee594b763100c2bf6265df9f3a7d..97b6f197f0079b949e4947df00efaed4dbfd76fe 100644 (file)
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -9,7 +9,7 @@
  
  #include <linux/kernel_stat.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/err.h>
  #include <linux/virtio.h>
  #include <linux/virtio_config.h>
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c

index 153b3f3cc795fdd5b7d0e31ff5a18043b738b4c8..a5136901dd8a94463f49cd87089403b0bf6e121c 100644 (file)
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -59,7 +59,7 @@
  #define KMSG_COMPONENT "SFI"
  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #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 79ad30d34949edfdbae4c2ca7c06a17649ec0c27..b929c7ae3a27eab8c28c218d8f467e62ae91862e 100644 (file)
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -24,7 +24,7 @@
  #include <linux/console.h>
  #include <linux/sysrq.h>
  #include <linux/device.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/dma-mapping.h>
  #include <linux/fs_uart_pd.h>
  #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 4eba17f3d2936ed92c4eac28b848051876a46b31..56fc527015cba508da1269950e8c68793f1a1347 100644 (file)
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
@@ -19,7 +19,7 @@
  #include <linux/console.h>
  #include <linux/sysrq.h>
  #include <linux/device.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/dma-mapping.h>
  
  #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 e3bff068dc3c62a93f551a2f6bbddbcceeeb2aac..6a1cd03bfe396386b878f846ede4429234e6b006 100644 (file)
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
@@ -19,7 +19,7 @@
  #include <linux/console.h>
  #include <linux/sysrq.h>
  #include <linux/device.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/dma-mapping.h>
  
  #include <asm/io.h>
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c

index ddc5fa88f2685457c00bb09b6e6504145a01d915..d2652dccc69975b6733fa597863561dc5bb92dc0 100644 (file)
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -12,7 +12,6 @@
  #include <linux/console.h>
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/io.h>
  #include <asm/pci-direct.h>
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c

index e12bb256036fbb0d56ee2523ec60b929f57340d5..a3f5cbfcd4a1b93b2593130be84c77cb40518b71 100644 (file)
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -44,7 +44,7 @@
  #include <linux/cred.h>
  #include <linux/errno.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/pagemap.h>
  #include <linux/highmem.h>
  #include <linux/mutex.h>
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c

index e6c1934734b7d9bdde87e8a9e006e1584c88f15d..93194f3e75404f05655028531d5ae710a6d6db87 100644 (file)
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -28,7 +28,7 @@
  #include <linux/irq.h>
  #include <linux/moduleparam.h>
  #include <linux/string.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/slab.h>
  #include <linux/irqnr.h>
  #include <linux/pci.h>
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c

index 84575baceebc829305e49b8855a0cad9c188a9fc..f15f89df1f3653675da3b84b1c7ce47debd1bac6 100644 (file)
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -33,7 +33,7 @@
  
  #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/sched.h>
  #include <linux/mm.h>
  #include <linux/slab.h>
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c

index c5f26a87d238a867fdf097ca1b038824c0dc6129..2a7f545bd0b577bef9a0058385c941f5c5fc6977 100644 (file)
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -35,7 +35,6 @@
  
  #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
  
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/dma-direct.h>
  #include <linux/export.h>
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c

index 55988b8418eeb7eb315745ad7737278fa3c5ddd7..5165aa82bf7d47322f9abc1ad7e7fb161663b6e4 100644 (file)
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -68,7 +68,7 @@
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
  #include <linux/kernel.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/swap.h>
  #include <linux/mm.h>
  #include <linux/mman.h>
diff --git a/fs/dcache.c b/fs/dcache.c

index c2e443fb76ae85bd22973a888c785e524de1f41a..2593153471cf71bb232bc42e73baea2c0bc5615c 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -26,7 +26,7 @@
  #include <linux/export.h>
  #include <linux/security.h>
  #include <linux/seqlock.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/bit_spinlock.h>
  #include <linux/rculist_bl.h>
  #include <linux/list_lru.h>
diff --git a/fs/inode.c b/fs/inode.c

index 9b808986d44043fae8b4bee0ff40644ef3598555..9e198f00b64c6f59e7e4a50b1bc8ddf4ec73cdbf 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -10,7 +10,7 @@
  #include <linux/swap.h>
  #include <linux/security.h>
  #include <linux/cdev.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/fsnotify.h>
  #include <linux/mount.h>
  #include <linux/posix_acl.h>
diff --git a/fs/namespace.c b/fs/namespace.c

index d86830c86ce8199ab0772f146f0a85377a441f92..98d27da43304706f4c8dcc572a397d89ff34cef2 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -23,7 +23,7 @@
  #include <linux/uaccess.h>
  #include <linux/proc_ns.h>
  #include <linux/magic.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/task_work.h>
  #include <linux/sched/task.h>
  
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c

index d297fe4472a960b29fd62018535400c5b96a975f..bbcc185062bb5c8198f7cefbc85520c5adeac0e2 100644 (file)
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -22,7 +22,7 @@
  #include <linux/vmalloc.h>
  #include <linux/highmem.h>
  #include <linux/printk.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/slab.h>
  #include <linux/uaccess.h>
diff --git a/fs/proc/page.c b/fs/proc/page.c

index 792c78a491747e248d99dc613c88e0beb8cffd0c..6c517b11acf829b5a1e2729f9d4748cb9cd56025 100644 (file)
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -1,5 +1,5 @@
  // SPDX-License-Identifier: GPL-2.0
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/compiler.h>
  #include <linux/fs.h>
  #include <linux/init.h>
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c

index 0377a104495b5837227e4a150f95e7b491929581..3fe90443c1bb8b8ad04dbcad10a08862448fd527 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -16,7 +16,7 @@
  #include <linux/slab.h>
  #include <linux/highmem.h>
  #include <linux/printk.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/crash_dump.h>
  #include <linux/list.h>
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h

deleted file mode 100644 (file)

index b58873a..0000000
--- a/include/linux/bootmem.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Discontiguous memory support, Kanoj Sarcar, SGI, Nov 1999
- */
-#ifndef _LINUX_BOOTMEM_H
-#define _LINUX_BOOTMEM_H
-
-#include <linux/mmzone.h>
-#include <linux/mm_types.h>
-#include <asm/dma.h>
-#include <asm/processor.h>
-
-/*
- *  simple boot-time physical memory area allocator.
- */
-
-extern unsigned long max_low_pfn;
-extern unsigned long min_low_pfn;
-
-/*
- * highest page
- */
-extern unsigned long max_pfn;
-/*
- * highest possible page
- */
-extern unsigned long long max_possible_pfn;
-
-extern unsigned long memblock_free_all(void);
-extern void reset_node_managed_pages(pg_data_t *pgdat);
-extern void reset_all_zones_managed_pages(void);
-
-/* We are using top down, so it is safe to use 0 here */
-#define BOOTMEM_LOW_LIMIT 0
-
-#ifndef ARCH_LOW_ADDRESS_LIMIT
-#define ARCH_LOW_ADDRESS_LIMIT  0xffffffffUL
-#endif
-
-/* FIXME: use MEMBLOCK_ALLOC_* variants here */
-#define BOOTMEM_ALLOC_ACCESSIBLE       0
-#define BOOTMEM_ALLOC_ANYWHERE         (~(phys_addr_t)0)
-
-/* FIXME: Move to memblock.h at a point where we remove nobootmem.c */
-void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
-                                     phys_addr_t min_addr,
-                                     phys_addr_t max_addr, int nid);
-void *memblock_alloc_try_nid_nopanic(phys_addr_t size,
-               phys_addr_t align, phys_addr_t min_addr,
-               phys_addr_t max_addr, int nid);
-void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
-               phys_addr_t min_addr, phys_addr_t max_addr, int nid);
-void __memblock_free_early(phys_addr_t base, phys_addr_t size);
-void __memblock_free_late(phys_addr_t base, phys_addr_t size);
-
-static inline void * __init memblock_alloc(
-                                       phys_addr_t size,  phys_addr_t align)
-{
-       return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
-                                           BOOTMEM_ALLOC_ACCESSIBLE,
-                                           NUMA_NO_NODE);
-}
-
-static inline void * __init memblock_alloc_raw(
-                                       phys_addr_t size,  phys_addr_t align)
-{
-       return memblock_alloc_try_nid_raw(size, align, BOOTMEM_LOW_LIMIT,
-                                           BOOTMEM_ALLOC_ACCESSIBLE,
-                                           NUMA_NO_NODE);
-}
-
-static inline void * __init memblock_alloc_from(
-               phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
-{
-       return memblock_alloc_try_nid(size, align, min_addr,
-                                     BOOTMEM_ALLOC_ACCESSIBLE,
-                                     NUMA_NO_NODE);
-}
-
-static inline void * __init memblock_alloc_nopanic(
-                                       phys_addr_t size, phys_addr_t align)
-{
-       return memblock_alloc_try_nid_nopanic(size, align,
-                                                   BOOTMEM_LOW_LIMIT,
-                                                   BOOTMEM_ALLOC_ACCESSIBLE,
-                                                   NUMA_NO_NODE);
-}
-
-static inline void * __init memblock_alloc_low(
-                                       phys_addr_t size, phys_addr_t align)
-{
-       return memblock_alloc_try_nid(size, align,
-                                                  BOOTMEM_LOW_LIMIT,
-                                                  ARCH_LOW_ADDRESS_LIMIT,
-                                                  NUMA_NO_NODE);
-}
-static inline void * __init memblock_alloc_low_nopanic(
-                                       phys_addr_t size, phys_addr_t align)
-{
-       return memblock_alloc_try_nid_nopanic(size, align,
-                                                  BOOTMEM_LOW_LIMIT,
-                                                  ARCH_LOW_ADDRESS_LIMIT,
-                                                  NUMA_NO_NODE);
-}
-
-static inline void * __init memblock_alloc_from_nopanic(
-               phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
-{
-       return memblock_alloc_try_nid_nopanic(size, align, min_addr,
-                                                   BOOTMEM_ALLOC_ACCESSIBLE,
-                                                   NUMA_NO_NODE);
-}
-
-static inline void * __init memblock_alloc_node(
-               phys_addr_t size, phys_addr_t align, int nid)
-{
-       return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
-                                           BOOTMEM_ALLOC_ACCESSIBLE, nid);
-}
-
-static inline void * __init memblock_alloc_node_nopanic(
-                                               phys_addr_t size, int nid)
-{
-       return memblock_alloc_try_nid_nopanic(size, 0, BOOTMEM_LOW_LIMIT,
-                                                   BOOTMEM_ALLOC_ACCESSIBLE,
-                                                   nid);
-}
-
-static inline void __init memblock_free_early(
-                                       phys_addr_t base, phys_addr_t size)
-{
-       __memblock_free_early(base, size);
-}
-
-static inline void __init memblock_free_early_nid(
-                               phys_addr_t base, phys_addr_t size, int nid)
-{
-       __memblock_free_early(base, size);
-}
-
-static inline void __init memblock_free_late(
-                                       phys_addr_t base, phys_addr_t size)
-{
-       __memblock_free_late(base, size);
-}
-
-extern void *alloc_large_system_hash(const char *tablename,
-                                    unsigned long bucketsize,
-                                    unsigned long numentries,
-                                    int scale,
-                                    int flags,
-                                    unsigned int *_hash_shift,
-                                    unsigned int *_hash_mask,
-                                    unsigned long low_limit,
-                                    unsigned long high_limit);
-
-#define HASH_EARLY     0x00000001      /* Allocating during early boot? */
-#define HASH_SMALL     0x00000002      /* sub-page allocation allowed, min
-                                        * shift passed via *_hash_shift */
-#define HASH_ZERO      0x00000004      /* Zero allocated hash table */
-
-/* Only NUMA needs hash distribution. 64bit NUMA architectures have
- * sufficient vmalloc space.
- */
-#ifdef CONFIG_NUMA
-#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
-extern int hashdist;           /* Distribute hashes across NUMA nodes? */
-#else
-#define hashdist (0)
-#endif
-
-
-#endif /* _LINUX_BOOTMEM_H */
diff --git a/include/linux/memblock.h b/include/linux/memblock.h

index 9d46a7204975083a0d0863a39c846407904f277a..1b4d85879cbe1f923222c5178f1d7e074bf8027c 100644 (file)
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -15,6 +15,19 @@
  
  #include <linux/init.h>
  #include <linux/mm.h>
+#include <asm/dma.h>
+
+extern unsigned long max_low_pfn;
+extern unsigned long min_low_pfn;
+
+/*
+ * highest page
+ */
+extern unsigned long max_pfn;
+/*
+ * highest possible page
+ */
+extern unsigned long long max_possible_pfn;
  
  #define INIT_MEMBLOCK_REGIONS  128
  #define INIT_PHYSMEM_REGIONS   4
@@ -119,6 +132,10 @@ int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);
  int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);
  enum memblock_flags choose_memblock_flags(void);
  
+unsigned long memblock_free_all(void);
+void reset_node_managed_pages(pg_data_t *pgdat);
+void reset_all_zones_managed_pages(void);
+
  /* Low level functions */
  int memblock_add_range(struct memblock_type *type,
                        phys_addr_t base, phys_addr_t size,
@@ -300,11 +317,116 @@ static inline int memblock_get_region_node(const struct memblock_region *r)
  }
  #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
  
+/* Flags for memblock allocation APIs */
+#define MEMBLOCK_ALLOC_ANYWHERE        (~(phys_addr_t)0)
+#define MEMBLOCK_ALLOC_ACCESSIBLE      0
+
+/* We are using top down, so it is safe to use 0 here */
+#define MEMBLOCK_LOW_LIMIT 0
+
+#ifndef ARCH_LOW_ADDRESS_LIMIT
+#define ARCH_LOW_ADDRESS_LIMIT  0xffffffffUL
+#endif
+
  phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid);
  phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
  
  phys_addr_t memblock_phys_alloc(phys_addr_t size, phys_addr_t align);
  
+void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
+                                phys_addr_t min_addr, phys_addr_t max_addr,
+                                int nid);
+void *memblock_alloc_try_nid_nopanic(phys_addr_t size, phys_addr_t align,
+                                    phys_addr_t min_addr, phys_addr_t max_addr,
+                                    int nid);
+void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
+                            phys_addr_t min_addr, phys_addr_t max_addr,
+                            int nid);
+
+static inline void * __init memblock_alloc(phys_addr_t size,  phys_addr_t align)
+{
+       return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
+                                     MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
+}
+
+static inline void * __init memblock_alloc_raw(phys_addr_t size,
+                                              phys_addr_t align)
+{
+       return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT,
+                                         MEMBLOCK_ALLOC_ACCESSIBLE,
+                                         NUMA_NO_NODE);
+}
+
+static inline void * __init memblock_alloc_from(phys_addr_t size,
+                                               phys_addr_t align,
+                                               phys_addr_t min_addr)
+{
+       return memblock_alloc_try_nid(size, align, min_addr,
+                                     MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
+}
+
+static inline void * __init memblock_alloc_nopanic(phys_addr_t size,
+                                                  phys_addr_t align)
+{
+       return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT,
+                                             MEMBLOCK_ALLOC_ACCESSIBLE,
+                                             NUMA_NO_NODE);
+}
+
+static inline void * __init memblock_alloc_low(phys_addr_t size,
+                                              phys_addr_t align)
+{
+       return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
+                                     ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE);
+}
+static inline void * __init memblock_alloc_low_nopanic(phys_addr_t size,
+                                                      phys_addr_t align)
+{
+       return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT,
+                                             ARCH_LOW_ADDRESS_LIMIT,
+                                             NUMA_NO_NODE);
+}
+
+static inline void * __init memblock_alloc_from_nopanic(phys_addr_t size,
+                                                       phys_addr_t align,
+                                                       phys_addr_t min_addr)
+{
+       return memblock_alloc_try_nid_nopanic(size, align, min_addr,
+                                             MEMBLOCK_ALLOC_ACCESSIBLE,
+                                             NUMA_NO_NODE);
+}
+
+static inline void * __init memblock_alloc_node(phys_addr_t size,
+                                               phys_addr_t align, int nid)
+{
+       return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
+                                     MEMBLOCK_ALLOC_ACCESSIBLE, nid);
+}
+
+static inline void * __init memblock_alloc_node_nopanic(phys_addr_t size,
+                                                       int nid)
+{
+       return memblock_alloc_try_nid_nopanic(size, 0, MEMBLOCK_LOW_LIMIT,
+                                             MEMBLOCK_ALLOC_ACCESSIBLE, nid);
+}
+
+static inline void __init memblock_free_early(phys_addr_t base,
+                                             phys_addr_t size)
+{
+       __memblock_free_early(base, size);
+}
+
+static inline void __init memblock_free_early_nid(phys_addr_t base,
+                                                 phys_addr_t size, int nid)
+{
+       __memblock_free_early(base, size);
+}
+
+static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
+{
+       __memblock_free_late(base, size);
+}
+
  /*
   * Set the allocation direction to bottom-up or top-down.
   */
@@ -323,10 +445,6 @@ static inline bool memblock_bottom_up(void)
         return memblock.bottom_up;
  }
  
-/* Flags for memblock_alloc_base() amd __memblock_alloc_base() */
-#define MEMBLOCK_ALLOC_ANYWHERE        (~(phys_addr_t)0)
-#define MEMBLOCK_ALLOC_ACCESSIBLE      0
-
  phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
                                         phys_addr_t start, phys_addr_t end,
                                         enum memblock_flags flags);
@@ -432,6 +550,31 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
              i < memblock_type->cnt;                                    \
              i++, rgn = &memblock_type->regions[i])
  
+extern void *alloc_large_system_hash(const char *tablename,
+                                    unsigned long bucketsize,
+                                    unsigned long numentries,
+                                    int scale,
+                                    int flags,
+                                    unsigned int *_hash_shift,
+                                    unsigned int *_hash_mask,
+                                    unsigned long low_limit,
+                                    unsigned long high_limit);
+
+#define HASH_EARLY     0x00000001      /* Allocating during early boot? */
+#define HASH_SMALL     0x00000002      /* sub-page allocation allowed, min
+                                        * shift passed via *_hash_shift */
+#define HASH_ZERO      0x00000004      /* Zero allocated hash table */
+
+/* Only NUMA needs hash distribution. 64bit NUMA architectures have
+ * sufficient vmalloc space.
+ */
+#ifdef CONFIG_NUMA
+#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
+extern int hashdist;           /* Distribute hashes across NUMA nodes? */
+#else
+#define hashdist (0)
+#endif
+
  #ifdef CONFIG_MEMTEST
  extern void early_memtest(phys_addr_t start, phys_addr_t end);
  #else
diff --git a/init/main.c b/init/main.c

index 8cef69c61389ac2085c06a8e0e768ca8d779cbaf..51b8e7b8ae5b6f2635978cbdca1069269155e734 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -25,7 +25,7 @@
  #include <linux/ioport.h>
  #include <linux/init.h>
  #include <linux/initrd.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/acpi.h>
  #include <linux/console.h>
  #include <linux/nmi.h>
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c

index f14c376937e5708d9b0d980130866631012dde8e..22a12ab5a5e9aaac7ac5207d70b059bd75e48965 100644 (file)
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -4,7 +4,7 @@
   *
   * DMA operations that map physical memory directly without using an IOMMU.
   */
-#include <linux/bootmem.h> /* for max_pfn */
+#include <linux/memblock.h> /* for max_pfn */
  #include <linux/export.h>
  #include <linux/mm.h>
  #include <linux/dma-direct.h>
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c

index 801da67e957bd18e301394fc9c87fffc1b0bd5ab..5731daa09a32edc2175657384aee68b60a365a2a 100644 (file)
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -40,7 +40,7 @@
  #include <asm/dma.h>
  
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/iommu-helper.h>
  
  #define CREATE_TRACE_POINTS
diff --git a/kernel/futex.c b/kernel/futex.c

index 3e2de8fc1891267111372d9edd71fa1f2494d6ed..f423f9b6577eb23849ebbbf87ee9549d74e62da2 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -65,7 +65,7 @@
  #include <linux/sched/mm.h>
  #include <linux/hugetlb.h>
  #include <linux/freezer.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/fault-inject.h>
  
  #include <asm/futex.h>
diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h

index 0130e488ebfeffb606f13da9fe4d46e66e675bbe..8f36c27c17948c8e34b8488af540b60c35e77a22 100644 (file)
--- a/kernel/locking/qspinlock_paravirt.h
+++ b/kernel/locking/qspinlock_paravirt.h
@@ -4,7 +4,7 @@
  #endif
  
  #include <linux/hash.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/debug_locks.h>
  
  /*
diff --git a/kernel/pid.c b/kernel/pid.c

index cdf63e53a01425182d66f1c8883a249cedbaaa88..b2f6c506035da7c75b6b7e277f8d7c1a7ee244a2 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -31,7 +31,7 @@
  #include <linux/slab.h>
  #include <linux/init.h>
  #include <linux/rculist.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/hash.h>
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c

index 34116a6097bea4ff94f296449fb94184b157c5a2..3c9e365438ad2491c3dab28ba2cc2386a2b5d40a 100644 (file)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -23,7 +23,7 @@
  #include <linux/pm.h>
  #include <linux/device.h>
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/nmi.h>
  #include <linux/syscalls.h>
  #include <linux/console.h>
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c

index 429e4a3833cae3e15e98225372530ad7094ae7a5..1b2a029360b7ac2f4832c2e4cdeafca6dd803b14 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -31,7 +31,6 @@
  #include <linux/delay.h>
  #include <linux/smp.h>
  #include <linux/security.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/syscalls.h>
  #include <linux/crash_core.h>
diff --git a/kernel/profile.c b/kernel/profile.c

index 9aa2a4445b0d2a21c736b844f2df7acebe7b2158..9c08a2c7cb1d3567d2162128c51d52db00f9eaa5 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -16,7 +16,7 @@
  
  #include <linux/export.h>
  #include <linux/profile.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/notifier.h>
  #include <linux/mm.h>
  #include <linux/cpumask.h>
diff --git a/lib/cpumask.c b/lib/cpumask.c

index 1405cb22e6bc1703aa7bd76d419c134d25652b42..75b5e7672c4c215c3c54e4105fb9586d95a70b27 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -4,7 +4,7 @@
  #include <linux/bitops.h>
  #include <linux/cpumask.h>
  #include <linux/export.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  /**
   * cpumask_next - get the next cpu in a cpumask
diff --git a/mm/hugetlb.c b/mm/hugetlb.c

index e35d99844612a5abc0fe3d8ab1ae4b973a7b47cb..c007fb5fb8d5f6547dc916e5ab468753028a862b 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -15,7 +15,6 @@
  #include <linux/compiler.h>
  #include <linux/cpuset.h>
  #include <linux/mutex.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/sysfs.h>
  #include <linux/slab.h>
diff --git a/mm/kasan/kasan_init.c b/mm/kasan/kasan_init.c

index 785a9707786b2efff5ff7b9e36dd4a853a54e27b..c7550eb65922cc3c313e8614d964b4a94f50c72f 100644 (file)
--- a/mm/kasan/kasan_init.c
+++ b/mm/kasan/kasan_init.c
@@ -10,11 +10,10 @@
   *
   */
  
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/init.h>
  #include <linux/kasan.h>
  #include <linux/kernel.h>
-#include <linux/memblock.h>
  #include <linux/mm.h>
  #include <linux/pfn.h>
  #include <linux/slab.h>
diff --git a/mm/kmemleak.c b/mm/kmemleak.c

index 4f7e4b5a2f082fafc7b354bf98242d6ad59588e0..877de4fa0720baea7252af98b1c03f718c33b118 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -92,7 +92,7 @@
  #include <linux/stacktrace.h>
  #include <linux/cache.h>
  #include <linux/percpu.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/pfn.h>
  #include <linux/mmzone.h>
  #include <linux/slab.h>
diff --git a/mm/memblock.c b/mm/memblock.c

index 2ed73245b5da65b0fb35a10d679323f433d6f224..c655342569f886fca976929f6e3086caa4d8c7e5 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -20,7 +20,6 @@
  #include <linux/kmemleak.h>
  #include <linux/seq_file.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  
  #include <asm/sections.h>
  #include <linux/io.h>
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c

index 7e6509a53d79facc47bcf0b5f0d5e37de32f3ad6..41e326472ef9290057d334ebdfbf95dca3bdbf5e 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -33,7 +33,6 @@
  #include <linux/stop_machine.h>
  #include <linux/hugetlb.h>
  #include <linux/memblock.h>
-#include <linux/bootmem.h>
  #include <linux/compaction.h>
  
  #include <asm/tlbflush.h>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c

index 5f32916019453a86abab474e686be32da9c2cb67..ef289fadec0e44fdc16cd594eba1533924f69d36 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -20,7 +20,6 @@
  #include <linux/interrupt.h>
  #include <linux/pagemap.h>
  #include <linux/jiffies.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/compiler.h>
  #include <linux/kernel.h>
diff --git a/mm/page_ext.c b/mm/page_ext.c

index 5323c2ade68649afd2202d8947ec67a8fa3e1903..ae44f7adbe07df3e32b5092ecc74f3c28c7416c2 100644 (file)
--- a/mm/page_ext.c
+++ b/mm/page_ext.c
@@ -1,7 +1,7 @@
  // SPDX-License-Identifier: GPL-2.0
  #include <linux/mm.h>
  #include <linux/mmzone.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/page_ext.h>
  #include <linux/memory.h>
  #include <linux/vmalloc.h>
diff --git a/mm/page_idle.c b/mm/page_idle.c

index 6302bc62c27d6b69939ab2791c57a5da8945e8aa..b9e4b42b33abaf6f932d38346805457e67ca96f0 100644 (file)
--- a/mm/page_idle.c
+++ b/mm/page_idle.c
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0
  #include <linux/init.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/fs.h>
  #include <linux/sysfs.h>
  #include <linux/kobject.h>
diff --git a/mm/page_owner.c b/mm/page_owner.c

index d80adfe702d3b85f754589135f3695b4e3394c72..87bc0dfdb52b679c19856d19878f2a5838ac3b55 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -3,7 +3,7 @@
  #include <linux/mm.h>
  #include <linux/slab.h>
  #include <linux/uaccess.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/stacktrace.h>
  #include <linux/page_owner.h>
  #include <linux/jump_label.h>
diff --git a/mm/percpu.c b/mm/percpu.c

index 3050c1d37d374004a140912a65cee0821fce7802..61cdbb3b373664f7ae54f1f51539ec29e58bbeb7 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -65,7 +65,7 @@
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
  #include <linux/bitmap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/err.h>
  #include <linux/lcm.h>
  #include <linux/list.h>
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c

index 7408cabed61aad66eed41b725d4f181eeb55fedf..7fec057967966c27fdedf3ccffc082ce12eb7ef7 100644 (file)
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -20,7 +20,6 @@
   */
  #include <linux/mm.h>
  #include <linux/mmzone.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/memremap.h>
  #include <linux/highmem.h>
diff --git a/mm/sparse.c b/mm/sparse.c

index b139fbc61d101f0c39f73bbb875e6a3653651fd0..ab2ac45e044091357751cb71e204b573128708cc 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -5,7 +5,6 @@
  #include <linux/mm.h>
  #include <linux/slab.h>
  #include <linux/mmzone.h>
-#include <linux/bootmem.h>
  #include <linux/memblock.h>
  #include <linux/compiler.h>
  #include <linux/highmem.h>
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c

index f5c9ef2586deb75edac0526b992087efa193d179..411dd7a90046eff218ac8aa97ca8f943b18ba985 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -19,7 +19,7 @@
  #include <linux/slab.h>
  #include <linux/wait.h>
  #include <linux/vmalloc.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  
  #include <net/addrconf.h>
  #include <net/inet_connection_sock.h>
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c

index 1834818ed07b3248ef36ce4e1b64887224ab1657..9e6bc4d6daa7503c7491c39870d76fd41ddb155c 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -262,7 +262,7 @@
  #include <linux/net.h>
  #include <linux/socket.h>
  #include <linux/random.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/swap.h>
  #include <linux/cache.h>
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c

index ca3ed931f2a91479940d1c2dbe55870aef2df96f..1976fddb9e00515072210c6bbcde929cb2832c73 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -81,7 +81,7 @@
  
  #include <linux/uaccess.h>
  #include <asm/ioctls.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/swap.h>
  #include <linux/types.h>
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c

index e948db29ab539a588e8526d2f4fc22428a9f4685..9b277bd36d1ade6acc46260c1d267bed801ee965 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -46,7 +46,7 @@
  #include <linux/netdevice.h>
  #include <linux/inetdevice.h>
  #include <linux/seq_file.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/highmem.h>
  #include <linux/swap.h>
  #include <linux/slab.h>
diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c

index 2ad33ce1ea177cb91069e37254fd56989e3ee70f..eca8d84d99bf2297f3b212cae08f9105dcc78317 100644 (file)
--- a/net/xfrm/xfrm_hash.c
+++ b/net/xfrm/xfrm_hash.c
@@ -6,7 +6,7 @@
  
  #include <linux/kernel.h>
  #include <linux/mm.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
  #include <linux/vmalloc.h>
  #include <linux/slab.h>
  #include <linux/xfrm.h>
author	Mike Rapoport <rppt@linux.vnet.ibm.com>
	Tue, 30 Oct 2018 22:09:49 +0000 (15:09 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 31 Oct 2018 15:54:16 +0000 (08:54 -0700)
arch/alpha/kernel/core_cia.c		patch \| blob \| history
arch/alpha/kernel/core_irongate.c		patch \| blob \| history
arch/alpha/kernel/core_marvel.c		patch \| blob \| history
arch/alpha/kernel/core_titan.c		patch \| blob \| history
arch/alpha/kernel/core_tsunami.c		patch \| blob \| history
arch/alpha/kernel/pci-noop.c		patch \| blob \| history
arch/alpha/kernel/pci.c		patch \| blob \| history
arch/alpha/kernel/pci_iommu.c		patch \| blob \| history
arch/alpha/kernel/setup.c		patch \| blob \| history
arch/alpha/kernel/sys_nautilus.c		patch \| blob \| history
arch/alpha/mm/init.c		patch \| blob \| history
arch/alpha/mm/numa.c		patch \| blob \| history
arch/arc/kernel/unwind.c		patch \| blob \| history
arch/arc/mm/highmem.c		patch \| blob \| history
arch/arc/mm/init.c		patch \| blob \| history
arch/arm/kernel/devtree.c		patch \| blob \| history
arch/arm/kernel/setup.c		patch \| blob \| history
arch/arm/mach-omap2/omap_hwmod.c		patch \| blob \| history
arch/arm/mm/dma-mapping.c		patch \| blob \| history
arch/arm/mm/init.c		patch \| blob \| history
arch/arm/xen/mm.c		patch \| blob \| history
arch/arm/xen/p2m.c		patch \| blob \| history
arch/arm64/kernel/acpi.c		patch \| blob \| history
arch/arm64/kernel/acpi_numa.c		patch \| blob \| history
arch/arm64/kernel/setup.c		patch \| blob \| history
arch/arm64/mm/dma-mapping.c		patch \| blob \| history
arch/arm64/mm/init.c		patch \| blob \| history
arch/arm64/mm/kasan_init.c		patch \| blob \| history
arch/arm64/mm/numa.c		patch \| blob \| history
arch/c6x/kernel/setup.c		patch \| blob \| history
arch/c6x/mm/init.c		patch \| blob \| history
arch/h8300/kernel/setup.c		patch \| blob \| history
arch/h8300/mm/init.c		patch \| blob \| history
arch/hexagon/kernel/dma.c		patch \| blob \| history
arch/hexagon/kernel/setup.c		patch \| blob \| history
arch/hexagon/mm/init.c		patch \| blob \| history
arch/ia64/kernel/crash.c		patch \| blob \| history
arch/ia64/kernel/efi.c		patch \| blob \| history
arch/ia64/kernel/ia64_ksyms.c		patch \| blob \| history
arch/ia64/kernel/iosapic.c		patch \| blob \| history
arch/ia64/kernel/mca.c		patch \| blob \| history
arch/ia64/kernel/mca_drv.c		patch \| blob \| history
arch/ia64/kernel/setup.c		patch \| blob \| history
arch/ia64/kernel/smpboot.c		patch \| blob \| history
arch/ia64/kernel/topology.c		patch \| blob \| history
arch/ia64/kernel/unwind.c		patch \| blob \| history
arch/ia64/mm/contig.c		patch \| blob \| history
arch/ia64/mm/discontig.c		patch \| blob \| history
arch/ia64/mm/init.c		patch \| blob \| history
arch/ia64/mm/numa.c		patch \| blob \| history
arch/ia64/mm/tlb.c		patch \| blob \| history
arch/ia64/pci/pci.c		patch \| blob \| history
arch/ia64/sn/kernel/bte.c		patch \| blob \| history
arch/ia64/sn/kernel/io_common.c		patch \| blob \| history
arch/ia64/sn/kernel/setup.c		patch \| blob \| history
arch/m68k/atari/stram.c		patch \| blob \| history
arch/m68k/coldfire/m54xx.c		patch \| blob \| history
arch/m68k/kernel/setup_mm.c		patch \| blob \| history
arch/m68k/kernel/setup_no.c		patch \| blob \| history
arch/m68k/kernel/uboot.c		patch \| blob \| history
arch/m68k/mm/init.c		patch \| blob \| history
arch/m68k/mm/mcfmmu.c		patch \| blob \| history
arch/m68k/mm/motorola.c		patch \| blob \| history
arch/m68k/mm/sun3mmu.c		patch \| blob \| history
arch/m68k/sun3/config.c		patch \| blob \| history
arch/m68k/sun3/dvma.c		patch \| blob \| history
arch/m68k/sun3/mmu_emu.c		patch \| blob \| history
arch/m68k/sun3/sun3dvma.c		patch \| blob \| history
arch/m68k/sun3x/dvma.c		patch \| blob \| history
arch/microblaze/mm/consistent.c		patch \| blob \| history
arch/microblaze/mm/init.c		patch \| blob \| history
arch/microblaze/pci/pci-common.c		patch \| blob \| history
arch/mips/ar7/memory.c		patch \| blob \| history
arch/mips/ath79/setup.c		patch \| blob \| history
arch/mips/bcm63xx/prom.c		patch \| blob \| history
arch/mips/bcm63xx/setup.c		patch \| blob \| history
arch/mips/bmips/setup.c		patch \| blob \| history
arch/mips/cavium-octeon/dma-octeon.c		patch \| blob \| history
arch/mips/dec/prom/memory.c		patch \| blob \| history
arch/mips/emma/common/prom.c		patch \| blob \| history
arch/mips/fw/arc/memory.c		patch \| blob \| history
arch/mips/jazz/jazzdma.c		patch \| blob \| history
arch/mips/kernel/crash.c		patch \| blob \| history
arch/mips/kernel/crash_dump.c		patch \| blob \| history
arch/mips/kernel/prom.c		patch \| blob \| history
arch/mips/kernel/setup.c		patch \| blob \| history
arch/mips/kernel/traps.c		patch \| blob \| history
arch/mips/kernel/vpe.c		patch \| blob \| history
arch/mips/kvm/commpage.c		patch \| blob \| history
arch/mips/kvm/dyntrans.c		patch \| blob \| history
arch/mips/kvm/emulate.c		patch \| blob \| history
arch/mips/kvm/interrupt.c		patch \| blob \| history
arch/mips/kvm/mips.c		patch \| blob \| history
arch/mips/lantiq/prom.c		patch \| blob \| history
arch/mips/lasat/prom.c		patch \| blob \| history
arch/mips/loongson64/common/init.c		patch \| blob \| history
arch/mips/loongson64/loongson-3/numa.c		patch \| blob \| history
arch/mips/mm/init.c		patch \| blob \| history
arch/mips/mm/pgtable-32.c		patch \| blob \| history
arch/mips/mti-malta/malta-memory.c		patch \| blob \| history
arch/mips/netlogic/xlp/dt.c		patch \| blob \| history
arch/mips/pci/pci-legacy.c		patch \| blob \| history
arch/mips/pci/pci.c		patch \| blob \| history
arch/mips/ralink/of.c		patch \| blob \| history
arch/mips/rb532/prom.c		patch \| blob \| history
arch/mips/sgi-ip27/ip27-memory.c		patch \| blob \| history
arch/mips/sibyte/common/cfe.c		patch \| blob \| history
arch/mips/sibyte/swarm/setup.c		patch \| blob \| history
arch/mips/txx9/rbtx4938/prom.c		patch \| blob \| history
arch/nds32/kernel/setup.c		patch \| blob \| history
arch/nds32/mm/highmem.c		patch \| blob \| history
arch/nds32/mm/init.c		patch \| blob \| history
arch/nios2/kernel/prom.c		patch \| blob \| history
arch/nios2/kernel/setup.c		patch \| blob \| history
arch/nios2/mm/init.c		patch \| blob \| history
arch/openrisc/kernel/setup.c		patch \| blob \| history
arch/openrisc/mm/init.c		patch \| blob \| history
arch/parisc/mm/init.c		patch \| blob \| history
arch/powerpc/kernel/pci_32.c		patch \| blob \| history
arch/powerpc/kernel/setup-common.c		patch \| blob \| history
arch/powerpc/kernel/setup_64.c		patch \| blob \| history
arch/powerpc/lib/alloc.c		patch \| blob \| history
arch/powerpc/mm/hugetlbpage.c		patch \| blob \| history
arch/powerpc/mm/mem.c		patch \| blob \| history
arch/powerpc/mm/mmu_context_nohash.c		patch \| blob \| history
arch/powerpc/mm/numa.c		patch \| blob \| history
arch/powerpc/platforms/powermac/nvram.c		patch \| blob \| history
arch/powerpc/platforms/powernv/pci-ioda.c		patch \| blob \| history
arch/powerpc/platforms/ps3/setup.c		patch \| blob \| history
arch/powerpc/sysdev/msi_bitmap.c		patch \| blob \| history
arch/riscv/mm/init.c		patch \| blob \| history
arch/s390/kernel/crash_dump.c		patch \| blob \| history
arch/s390/kernel/setup.c		patch \| blob \| history
arch/s390/kernel/smp.c		patch \| blob \| history
arch/s390/kernel/topology.c		patch \| blob \| history
arch/s390/kernel/vdso.c		patch \| blob \| history
arch/s390/mm/extmem.c		patch \| blob \| history
arch/s390/mm/init.c		patch \| blob \| history
arch/s390/mm/vmem.c		patch \| blob \| history
arch/s390/numa/mode_emu.c		patch \| blob \| history
arch/s390/numa/numa.c		patch \| blob \| history
arch/s390/numa/toptree.c		patch \| blob \| history
arch/sh/mm/init.c		patch \| blob \| history
arch/sh/mm/ioremap_fixed.c		patch \| blob \| history
arch/sparc/kernel/mdesc.c		patch \| blob \| history
arch/sparc/kernel/prom_32.c		patch \| blob \| history
arch/sparc/kernel/setup_64.c		patch \| blob \| history
arch/sparc/kernel/smp_64.c		patch \| blob \| history
arch/sparc/mm/init_32.c		patch \| blob \| history
arch/sparc/mm/init_64.c		patch \| blob \| history
arch/sparc/mm/srmmu.c		patch \| blob \| history
arch/um/drivers/net_kern.c		patch \| blob \| history
arch/um/drivers/vector_kern.c		patch \| blob \| history
arch/um/kernel/initrd.c		patch \| blob \| history
arch/um/kernel/mem.c		patch \| blob \| history
arch/um/kernel/physmem.c		patch \| blob \| history
arch/unicore32/kernel/hibernate.c		patch \| blob \| history
arch/unicore32/kernel/setup.c		patch \| blob \| history
arch/unicore32/mm/init.c		patch \| blob \| history
arch/unicore32/mm/mmu.c		patch \| blob \| history
arch/x86/kernel/acpi/boot.c		patch \| blob \| history
arch/x86/kernel/acpi/sleep.c		patch \| blob \| history
arch/x86/kernel/apic/apic.c		patch \| blob \| history
arch/x86/kernel/apic/io_apic.c		patch \| blob \| history
arch/x86/kernel/cpu/common.c		patch \| blob \| history
arch/x86/kernel/e820.c		patch \| blob \| history
arch/x86/kernel/mpparse.c		patch \| blob \| history
arch/x86/kernel/pci-dma.c		patch \| blob \| history
arch/x86/kernel/pci-swiotlb.c		patch \| blob \| history
arch/x86/kernel/pvclock.c		patch \| blob \| history
arch/x86/kernel/setup.c		patch \| blob \| history
arch/x86/kernel/setup_percpu.c		patch \| blob \| history
arch/x86/kernel/smpboot.c		patch \| blob \| history
arch/x86/kernel/tce_64.c		patch \| blob \| history
arch/x86/mm/amdtopology.c		patch \| blob \| history
arch/x86/mm/fault.c		patch \| blob \| history
arch/x86/mm/highmem_32.c		patch \| blob \| history
arch/x86/mm/init.c		patch \| blob \| history
arch/x86/mm/init_32.c		patch \| blob \| history
arch/x86/mm/init_64.c		patch \| blob \| history
arch/x86/mm/ioremap.c		patch \| blob \| history
arch/x86/mm/kasan_init_64.c		patch \| blob \| history
arch/x86/mm/kaslr.c		patch \| blob \| history
arch/x86/mm/numa.c		patch \| blob \| history
arch/x86/mm/numa_32.c		patch \| blob \| history
arch/x86/mm/numa_64.c		patch \| blob \| history
arch/x86/mm/numa_emulation.c		patch \| blob \| history
arch/x86/mm/pageattr-test.c		patch \| blob \| history
arch/x86/mm/pageattr.c		patch \| blob \| history
arch/x86/mm/pat.c		patch \| blob \| history
arch/x86/mm/physaddr.c		patch \| blob \| history
arch/x86/pci/i386.c		patch \| blob \| history
arch/x86/platform/efi/efi.c		patch \| blob \| history
arch/x86/platform/efi/efi_64.c		patch \| blob \| history
arch/x86/platform/efi/quirks.c		patch \| blob \| history
arch/x86/platform/olpc/olpc_dt.c		patch \| blob \| history
arch/x86/power/hibernate_32.c		patch \| blob \| history
arch/x86/xen/enlighten.c		patch \| blob \| history
arch/x86/xen/enlighten_pv.c		patch \| blob \| history
arch/x86/xen/p2m.c		patch \| blob \| history
arch/xtensa/kernel/pci.c		patch \| blob \| history
arch/xtensa/mm/cache.c		patch \| blob \| history
arch/xtensa/mm/init.c		patch \| blob \| history
arch/xtensa/mm/kasan_init.c		patch \| blob \| history
arch/xtensa/mm/mmu.c		patch \| blob \| history
arch/xtensa/platforms/iss/network.c		patch \| blob \| history
arch/xtensa/platforms/iss/setup.c		patch \| blob \| history
block/blk-settings.c		patch \| blob \| history
block/bounce.c		patch \| blob \| history
drivers/acpi/numa.c		patch \| blob \| history
drivers/acpi/tables.c		patch \| blob \| history
drivers/base/platform.c		patch \| blob \| history
drivers/clk/ti/clk.c		patch \| blob \| history
drivers/firmware/dmi_scan.c		patch \| blob \| history
drivers/firmware/efi/apple-properties.c		patch \| blob \| history
drivers/firmware/iscsi_ibft_find.c		patch \| blob \| history
drivers/firmware/memmap.c		patch \| blob \| history
drivers/iommu/mtk_iommu.c		patch \| blob \| history
drivers/iommu/mtk_iommu_v1.c		patch \| blob \| history
drivers/macintosh/smu.c		patch \| blob \| history
drivers/mtd/ar7part.c		patch \| blob \| history
drivers/net/arcnet/arc-rimi.c		patch \| blob \| history
drivers/net/arcnet/com20020-isa.c		patch \| blob \| history
drivers/net/arcnet/com90io.c		patch \| blob \| history
drivers/of/fdt.c		patch \| blob \| history
drivers/of/unittest.c		patch \| blob \| history
drivers/s390/char/fs3270.c		patch \| blob \| history
drivers/s390/char/tty3270.c		patch \| blob \| history
drivers/s390/cio/cmf.c		patch \| blob \| history
drivers/s390/virtio/virtio_ccw.c		patch \| blob \| history
drivers/sfi/sfi_core.c		patch \| blob \| history
drivers/tty/serial/cpm_uart/cpm_uart_core.c		patch \| blob \| history
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c		patch \| blob \| history
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c		patch \| blob \| history
drivers/usb/early/xhci-dbc.c		patch \| blob \| history
drivers/xen/balloon.c		patch \| blob \| history
drivers/xen/events/events_base.c		patch \| blob \| history
drivers/xen/grant-table.c		patch \| blob \| history
drivers/xen/swiotlb-xen.c		patch \| blob \| history
drivers/xen/xen-selfballoon.c		patch \| blob \| history
fs/dcache.c		patch \| blob \| history
fs/inode.c		patch \| blob \| history
fs/namespace.c		patch \| blob \| history
fs/proc/kcore.c		patch \| blob \| history
fs/proc/page.c		patch \| blob \| history
fs/proc/vmcore.c		patch \| blob \| history
include/linux/bootmem.h	[deleted file]	patch \| blob \| history
include/linux/memblock.h		patch \| blob \| history
init/main.c		patch \| blob \| history
kernel/dma/direct.c		patch \| blob \| history
kernel/dma/swiotlb.c		patch \| blob \| history
kernel/futex.c		patch \| blob \| history
kernel/locking/qspinlock_paravirt.h		patch \| blob \| history
kernel/pid.c		patch \| blob \| history
kernel/power/snapshot.c		patch \| blob \| history
kernel/printk/printk.c		patch \| blob \| history
kernel/profile.c		patch \| blob \| history
lib/cpumask.c		patch \| blob \| history
mm/hugetlb.c		patch \| blob \| history
mm/kasan/kasan_init.c		patch \| blob \| history
mm/kmemleak.c		patch \| blob \| history
mm/memblock.c		patch \| blob \| history
mm/memory_hotplug.c		patch \| blob \| history
mm/page_alloc.c		patch \| blob \| history
mm/page_ext.c		patch \| blob \| history
mm/page_idle.c		patch \| blob \| history
mm/page_owner.c		patch \| blob \| history
mm/percpu.c		patch \| blob \| history
mm/sparse-vmemmap.c		patch \| blob \| history
mm/sparse.c		patch \| blob \| history
net/ipv4/inet_hashtables.c		patch \| blob \| history
net/ipv4/tcp.c		patch \| blob \| history
net/ipv4/udp.c		patch \| blob \| history
net/sctp/protocol.c		patch \| blob \| history
net/xfrm/xfrm_hash.c		patch \| blob \| history