History

mm: remove include/linux/bootmem.h

Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Mike Rapoport committed 8 years ago

Commit 57c8a661 parent 97ad108275 files · +353 −476Browse files

Unified · Split

275 files
  1. arch/alpha/kernel/core_cia.c +1 −1
  2. arch/alpha/kernel/core_irongate.c +0 −1
  3. arch/alpha/kernel/core_marvel.c +1 −1
  4. arch/alpha/kernel/core_titan.c +1 −1
  5. arch/alpha/kernel/core_tsunami.c +1 −1
  6. arch/alpha/kernel/pci-noop.c +1 −1
  7. arch/alpha/kernel/pci.c +1 −1
  8. arch/alpha/kernel/pci_iommu.c +1 −1
  9. arch/alpha/kernel/setup.c +0 −1
  10. arch/alpha/kernel/sys_nautilus.c +1 −1
  11. arch/alpha/mm/init.c +1 −1
  12. arch/alpha/mm/numa.c +0 −1
  13. arch/arc/kernel/unwind.c +1 −1
  14. arch/arc/mm/highmem.c +1 −1
  15. arch/arc/mm/init.c +0 −1
  16. arch/arm/kernel/devtree.c +0 −1
  17. arch/arm/kernel/setup.c +0 −1
  18. arch/arm/mach-omap2/omap_hwmod.c +1 −1
  19. arch/arm/mm/dma-mapping.c +0 −1
  20. arch/arm/mm/init.c +0 −1
  21. arch/arm/xen/mm.c +0 −1
  22. arch/arm/xen/p2m.c +1 −1
  23. arch/arm64/kernel/acpi.c +0 −1
  24. arch/arm64/kernel/acpi_numa.c +0 −1
  25. arch/arm64/kernel/setup.c +0 −1
  26. arch/arm64/mm/dma-mapping.c +1 −1
  27. arch/arm64/mm/init.c +0 −1
  28. arch/arm64/mm/kasan_init.c +0 −1
  29. arch/arm64/mm/numa.c +0 −1
  30. arch/c6x/kernel/setup.c +0 −1
  31. arch/c6x/mm/init.c +1 −1
  32. arch/h8300/kernel/setup.c +0 −1
  33. arch/h8300/mm/init.c +1 −1
  34. arch/hexagon/kernel/dma.c +1 −1
  35. arch/hexagon/kernel/setup.c +1 −1
  36. arch/hexagon/mm/init.c +0 −1
  37. arch/ia64/kernel/crash.c +1 −1
  38. arch/ia64/kernel/efi.c +1 −1
  39. arch/ia64/kernel/ia64_ksyms.c +1 −1
  40. arch/ia64/kernel/iosapic.c +1 −1
  41. arch/ia64/kernel/mca.c +1 −1
  42. arch/ia64/kernel/mca_drv.c +1 −1
  43. arch/ia64/kernel/setup.c +0 −1
  44. arch/ia64/kernel/smpboot.c +1 −1
  45. arch/ia64/kernel/topology.c +1 −1
  46. arch/ia64/kernel/unwind.c +1 −1
  47. arch/ia64/mm/contig.c +0 −1
  48. arch/ia64/mm/discontig.c +0 −1
  49. arch/ia64/mm/init.c +0 −1
  50. arch/ia64/mm/numa.c +1 −1
  51. arch/ia64/mm/tlb.c +1 −1
  52. arch/ia64/pci/pci.c +1 −1
  53. arch/ia64/sn/kernel/bte.c +1 −1
  54. arch/ia64/sn/kernel/io_common.c +1 −1
  55. arch/ia64/sn/kernel/setup.c +1 −1
  56. arch/m68k/atari/stram.c +1 −1
  57. arch/m68k/coldfire/m54xx.c +1 −1
  58. arch/m68k/kernel/setup_mm.c +0 −1
  59. arch/m68k/kernel/setup_no.c +0 −1
  60. arch/m68k/kernel/uboot.c +1 −1
  61. arch/m68k/mm/init.c +1 −1
  62. arch/m68k/mm/mcfmmu.c +0 −1
  63. arch/m68k/mm/motorola.c +0 −1
  64. arch/m68k/mm/sun3mmu.c +1 −1
  65. arch/m68k/sun3/config.c +1 −1
  66. arch/m68k/sun3/dvma.c +1 −1
  67. arch/m68k/sun3/mmu_emu.c +1 −1
  68. arch/m68k/sun3/sun3dvma.c +1 −1
  69. arch/m68k/sun3x/dvma.c +1 −1
  70. arch/microblaze/mm/consistent.c +1 −1
  71. arch/microblaze/mm/init.c +1 −2
  72. arch/microblaze/pci/pci-common.c +1 −1
  73. arch/mips/ar7/memory.c +1 −1
  74. arch/mips/ath79/setup.c +1 −1
  75. arch/mips/bcm63xx/prom.c +1 −1
  76. arch/mips/bcm63xx/setup.c +1 −1
  77. arch/mips/bmips/setup.c +1 −1
  78. arch/mips/cavium-octeon/dma-octeon.c +1 −1
  79. arch/mips/dec/prom/memory.c +1 −1
  80. arch/mips/emma/common/prom.c +1 −1
  81. arch/mips/fw/arc/memory.c +1 −1
  82. arch/mips/jazz/jazzdma.c +1 −1
  83. arch/mips/kernel/crash.c +1 −1
  84. arch/mips/kernel/crash_dump.c +1 −1
  85. arch/mips/kernel/prom.c +1 −1
  86. arch/mips/kernel/setup.c +0 −1
  87. arch/mips/kernel/traps.c +0 −1
  88. arch/mips/kernel/vpe.c +1 −1
  89. arch/mips/kvm/commpage.c +1 −1
  90. arch/mips/kvm/dyntrans.c +1 −1
  91. arch/mips/kvm/emulate.c +1 −1
  92. arch/mips/kvm/interrupt.c +1 −1
  93. arch/mips/kvm/mips.c +1 −1
  94. arch/mips/lantiq/prom.c +1 −1
  95. arch/mips/lasat/prom.c +1 −1
  96. arch/mips/loongson64/common/init.c +1 −1
  97. arch/mips/loongson64/loongson-3/numa.c +0 −1
  98. arch/mips/mm/init.c +1 −1
  99. arch/mips/mm/pgtable-32.c +1 −1
  100. arch/mips/mti-malta/malta-memory.c +1 −1
  101. arch/mips/netlogic/xlp/dt.c +1 −1
  102. arch/mips/pci/pci-legacy.c +1 −1
  103. arch/mips/pci/pci.c +1 −1
  104. arch/mips/ralink/of.c +1 −1
  105. arch/mips/rb532/prom.c +1 −1
  106. arch/mips/sgi-ip27/ip27-memory.c +0 −1
  107. arch/mips/sibyte/common/cfe.c +1 −1
  108. arch/mips/sibyte/swarm/setup.c +1 −1
  109. arch/mips/txx9/rbtx4938/prom.c +1 −1
  110. arch/nds32/kernel/setup.c +1 −2
  111. arch/nds32/mm/highmem.c +1 −1
  112. arch/nds32/mm/init.c +1 −2
  113. arch/nios2/kernel/prom.c +1 −1
  114. arch/nios2/kernel/setup.c +0 −1
  115. arch/nios2/mm/init.c +1 −1
  116. arch/openrisc/kernel/setup.c +1 −2
  117. arch/openrisc/mm/init.c +1 −2
  118. arch/parisc/mm/init.c +0 −1
  119. arch/powerpc/kernel/pci_32.c +1 −1
  120. arch/powerpc/kernel/setup-common.c +0 −1
  121. arch/powerpc/kernel/setup_64.c +1 −2
  122. arch/powerpc/lib/alloc.c +1 −1
  123. arch/powerpc/mm/hugetlbpage.c +0 −1
  124. arch/powerpc/mm/mem.c +1 −2
  125. arch/powerpc/mm/mmu_context_nohash.c +1 −1
  126. arch/powerpc/mm/numa.c +1 −2
  127. arch/powerpc/platforms/powermac/nvram.c +1 −1
  128. arch/powerpc/platforms/powernv/pci-ioda.c +1 −2
  129. arch/powerpc/platforms/ps3/setup.c +1 −1
  130. arch/powerpc/sysdev/msi_bitmap.c +1 −1
  131. arch/riscv/mm/init.c +1 −2
  132. arch/s390/kernel/crash_dump.c +1 −2
  133. arch/s390/kernel/setup.c +0 −1
  134. arch/s390/kernel/smp.c +1 −2
  135. arch/s390/kernel/topology.c +1 −1
  136. arch/s390/kernel/vdso.c +1 −1
  137. arch/s390/mm/extmem.c +1 −1
  138. arch/s390/mm/init.c +1 −2
  139. arch/s390/mm/vmem.c +1 −2
  140. arch/s390/numa/mode_emu.c +0 −1
  141. arch/s390/numa/numa.c +0 −1
  142. arch/s390/numa/toptree.c +1 −1
  143. arch/sh/mm/init.c +1 −2
  144. arch/sh/mm/ioremap_fixed.c +1 −1
  145. arch/sparc/kernel/mdesc.c +0 −2
  146. arch/sparc/kernel/prom_32.c +1 −1
  147. arch/sparc/kernel/setup_64.c +1 −1
  148. arch/sparc/kernel/smp_64.c +1 −1
  149. arch/sparc/mm/init_32.c +0 −1
  150. arch/sparc/mm/init_64.c +1 −2
  151. arch/sparc/mm/srmmu.c +1 −1
  152. arch/um/drivers/net_kern.c +1 −1
  153. arch/um/drivers/vector_kern.c +1 −1
  154. arch/um/kernel/initrd.c +1 −1
  155. arch/um/kernel/mem.c +0 −1
  156. arch/um/kernel/physmem.c +0 −1
  157. arch/unicore32/kernel/hibernate.c +1 −1
  158. arch/unicore32/kernel/setup.c +1 −2
  159. arch/unicore32/mm/init.c +1 −2
  160. arch/unicore32/mm/mmu.c +0 −1
  161. arch/x86/kernel/acpi/boot.c +1 −1
  162. arch/x86/kernel/acpi/sleep.c +0 −1
  163. arch/x86/kernel/apic/apic.c +1 −1
  164. arch/x86/kernel/apic/io_apic.c +1 −1
  165. arch/x86/kernel/cpu/common.c +1 −1
  166. arch/x86/kernel/e820.c +1 −2
  167. arch/x86/kernel/mpparse.c +0 −1
  168. arch/x86/kernel/pci-dma.c +1 −1
  169. arch/x86/kernel/pci-swiotlb.c +1 −1
  170. arch/x86/kernel/pvclock.c +1 −1
  171. arch/x86/kernel/setup.c +0 −1
  172. arch/x86/kernel/setup_percpu.c +0 −1
  173. arch/x86/kernel/smpboot.c +1 −1
  174. arch/x86/kernel/tce_64.c +0 −1
  175. arch/x86/mm/amdtopology.c +0 −1
  176. arch/x86/mm/fault.c +1 −1
  177. arch/x86/mm/highmem_32.c +1 −1
  178. arch/x86/mm/init.c +0 −1
  179. arch/x86/mm/init_32.c +0 −1
  180. arch/x86/mm/init_64.c +0 −1
  181. arch/x86/mm/ioremap.c +1 −1
  182. arch/x86/mm/kasan_init_64.c +1 −2
  183. arch/x86/mm/kaslr.c +1 −0
  184. arch/x86/mm/numa.c +0 −1
  185. arch/x86/mm/numa_32.c +0 −1
  186. arch/x86/mm/numa_64.c +1 −1
  187. arch/x86/mm/numa_emulation.c +0 −1
  188. arch/x86/mm/pageattr-test.c +1 −1
  189. arch/x86/mm/pageattr.c +1 −1
  190. arch/x86/mm/pat.c +1 −1
  191. arch/x86/mm/physaddr.c +1 −1
  192. arch/x86/pci/i386.c +1 −1
  193. arch/x86/platform/efi/efi.c +1 −2
  194. arch/x86/platform/efi/efi_64.c +1 −1
  195. arch/x86/platform/efi/quirks.c +0 −1
  196. arch/x86/platform/olpc/olpc_dt.c +1 −1
  197. arch/x86/power/hibernate_32.c +1 −1
  198. arch/x86/xen/enlighten.c +1 −1
  199. arch/x86/xen/enlighten_pv.c +1 −2
  200. arch/x86/xen/p2m.c +0 −1
  201. arch/xtensa/kernel/pci.c +1 −1
  202. arch/xtensa/mm/cache.c +1 −1
  203. arch/xtensa/mm/init.c +1 −1
  204. arch/xtensa/mm/kasan_init.c +1 −2
  205. arch/xtensa/mm/mmu.c +1 −1
  206. arch/xtensa/platforms/iss/network.c +1 −1
  207. arch/xtensa/platforms/iss/setup.c +1 −1
  208. block/blk-settings.c +1 −1
  209. block/bounce.c +1 −1
  210. drivers/acpi/numa.c +0 −1
  211. drivers/acpi/tables.c +1 −2
  212. drivers/base/platform.c +1 −1
  213. drivers/clk/ti/clk.c +1 −1
  214. drivers/firmware/dmi_scan.c +1 −1
  215. drivers/firmware/efi/apple-properties.c +1 −1
  216. drivers/firmware/iscsi_ibft_find.c +1 −1
  217. drivers/firmware/memmap.c +1 −1
  218. drivers/iommu/mtk_iommu.c +1 −1
  219. drivers/iommu/mtk_iommu_v1.c +1 −1
  220. drivers/macintosh/smu.c +1 −2
  221. drivers/mtd/ar7part.c +1 −1
  222. drivers/net/arcnet/arc-rimi.c +1 −1
  223. drivers/net/arcnet/com20020-isa.c +1 −1
  224. drivers/net/arcnet/com90io.c +1 −1
  225. drivers/of/fdt.c +0 −1
  226. drivers/of/unittest.c +1 −1
  227. drivers/s390/char/fs3270.c +1 −1
  228. drivers/s390/char/tty3270.c +1 −1
  229. drivers/s390/cio/cmf.c +1 −1
  230. drivers/s390/virtio/virtio_ccw.c +1 −1
  231. drivers/sfi/sfi_core.c +1 −1
  232. drivers/tty/serial/cpm_uart/cpm_uart_core.c +1 −1
  233. drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c +1 −1
  234. drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c +1 −1
  235. drivers/usb/early/xhci-dbc.c +0 −1
  236. drivers/xen/balloon.c +1 −1
  237. drivers/xen/events/events_base.c +1 −1
  238. drivers/xen/grant-table.c +1 −1
  239. drivers/xen/swiotlb-xen.c +0 −1
  240. drivers/xen/xen-selfballoon.c +1 −1
  241. fs/dcache.c +1 −1
  242. fs/inode.c +1 −1
  243. fs/namespace.c +1 −1
  244. fs/proc/kcore.c +1 −1
  245. fs/proc/page.c +1 −1
  246. fs/proc/vmcore.c +1 −1
  247. include/linux/bootmem.h +0 −173
  248. include/linux/memblock.h +147 −4
  249. init/main.c +1 −1
  250. kernel/dma/direct.c +1 −1
  251. kernel/dma/swiotlb.c +1 −1
  252. kernel/futex.c +1 −1
  253. kernel/locking/qspinlock_paravirt.h +1 −1
  254. kernel/pid.c +1 −1
  255. kernel/power/snapshot.c +1 −1
  256. kernel/printk/printk.c +0 −1
  257. kernel/profile.c +1 −1
  258. lib/cpumask.c +1 −1
  259. mm/hugetlb.c +0 −1
  260. mm/kasan/kasan_init.c +1 −2
  261. mm/kmemleak.c +1 −1
  262. mm/memblock.c +0 −1
  263. mm/memory_hotplug.c +0 −1
  264. mm/page_alloc.c +0 −1
  265. mm/page_ext.c +1 −1
  266. mm/page_idle.c +1 −1
  267. mm/page_owner.c +1 −1
  268. mm/percpu.c +1 −1
  269. mm/sparse-vmemmap.c +0 −1
  270. mm/sparse.c +0 −1
  271. net/ipv4/inet_hashtables.c +1 −1
  272. net/ipv4/tcp.c +1 −1
  273. net/ipv4/udp.c +1 −1
  274. net/sctp/protocol.c +1 −1
  275. net/xfrm/xfrm_hash.c +1 −1
arch/alpha/kernel/core_cia.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/pci.h>
2222 #include <linux/sched.h>
2323 #include <linux/init.h>
24−#include <linux/bootmem.h>
24+#include <linux/memblock.h>
2525
2626 #include <asm/ptrace.h>
2727 #include <asm/mce.h>
arch/alpha/kernel/core_irongate.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #include <linux/sched.h>
2121 #include <linux/init.h>
2222 #include <linux/initrd.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524
2625 #include <asm/ptrace.h>
arch/alpha/kernel/core_marvel.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/mc146818rtc.h>
1919 #include <linux/rtc.h>
2020 #include <linux/module.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222
2323 #include <asm/ptrace.h>
2424 #include <asm/smp.h>
arch/alpha/kernel/core_titan.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/sched.h>
1717 #include <linux/init.h>
1818 #include <linux/vmalloc.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020
2121 #include <asm/ptrace.h>
2222 #include <asm/smp.h>
arch/alpha/kernel/core_tsunami.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 #include <linux/pci.h>
1818 #include <linux/sched.h>
1919 #include <linux/init.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121
2222 #include <asm/ptrace.h>
2323 #include <asm/smp.h>
arch/alpha/kernel/pci-noop.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77
88 #include <linux/pci.h>
99 #include <linux/init.h>
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/gfp.h>
1212 #include <linux/capability.h>
1313 #include <linux/mm.h>
arch/alpha/kernel/pci.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/init.h>
1919 #include <linux/ioport.h>
2020 #include <linux/kernel.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222 #include <linux/module.h>
2323 #include <linux/cache.h>
2424 #include <linux/slab.h>
arch/alpha/kernel/pci_iommu.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 #include <linux/mm.h>
88 #include <linux/pci.h>
99 #include <linux/gfp.h>
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/export.h>
1212 #include <linux/scatterlist.h>
1313 #include <linux/log2.h>
arch/alpha/kernel/setup.c+0−1
@@ -29,7 +29,6 @@ · 28 unmodified lines
2929 #include <linux/string.h>
3030 #include <linux/ioport.h>
3131 #include <linux/platform_device.h>
32−#include <linux/bootmem.h>
3332 #include <linux/memblock.h>
3433 #include <linux/pci.h>
3534 #include <linux/seq_file.h>
arch/alpha/kernel/sys_nautilus.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <linux/pci.h>
3333 #include <linux/init.h>
3434 #include <linux/reboot.h>
35−#include <linux/bootmem.h>
35+#include <linux/memblock.h>
3636 #include <linux/bitops.h>
3737
3838 #include <asm/ptrace.h>
arch/alpha/mm/init.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/mm.h>
2020 #include <linux/swap.h>
2121 #include <linux/init.h>
22−#include <linux/bootmem.h> /* max_low_pfn */
22+#include <linux/memblock.h> /* max_low_pfn */
2323 #include <linux/vmalloc.h>
2424 #include <linux/gfp.h>
2525
arch/alpha/mm/numa.c+0−1
@@ -10,7 +10,6 @@ · 9 unmodified lines
1010 #include <linux/types.h>
1111 #include <linux/kernel.h>
1212 #include <linux/mm.h>
13−#include <linux/bootmem.h>
1413 #include <linux/memblock.h>
1514 #include <linux/swap.h>
1615 #include <linux/initrd.h>
arch/arc/kernel/unwind.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515
1616 #include <linux/sched.h>
1717 #include <linux/module.h>
18−#include <linux/bootmem.h>
18+#include <linux/memblock.h>
1919 #include <linux/sort.h>
2020 #include <linux/slab.h>
2121 #include <linux/stop_machine.h>
arch/arc/mm/highmem.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 *
88 */
99
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/export.h>
1212 #include <linux/highmem.h>
1313 #include <asm/processor.h>
arch/arc/mm/init.c+0−1
@@ -8,7 +8,6 @@ · 7 unmodified lines
88
99 #include <linux/kernel.h>
1010 #include <linux/mm.h>
11−#include <linux/bootmem.h>
1211 #include <linux/memblock.h>
1312 #ifdef CONFIG_BLK_DEV_INITRD
1413 #include <linux/initrd.h>
arch/arm/kernel/devtree.c+0−1
@@ -12,7 +12,6 @@ · 11 unmodified lines
1212 #include <linux/export.h>
1313 #include <linux/errno.h>
1414 #include <linux/types.h>
15−#include <linux/bootmem.h>
1615 #include <linux/memblock.h>
1716 #include <linux/of.h>
1817 #include <linux/of_fdt.h>
arch/arm/kernel/setup.c+0−1
@@ -16,7 +16,6 @@ · 15 unmodified lines
1616 #include <linux/utsname.h>
1717 #include <linux/initrd.h>
1818 #include <linux/console.h>
19−#include <linux/bootmem.h>
2019 #include <linux/seq_file.h>
2120 #include <linux/screen_info.h>
2221 #include <linux/of_platform.h>
arch/arm/mach-omap2/omap_hwmod.c+1−1
@@ -141,7 +141,7 @@ · 140 unmodified lines
141141 #include <linux/cpu.h>
142142 #include <linux/of.h>
143143 #include <linux/of_address.h>
144−#include <linux/bootmem.h>
144+#include <linux/memblock.h>
145145
146146 #include <linux/platform_data/ti-sysc.h>
147147
arch/arm/mm/dma-mapping.c+0−1
@@ -9,7 +9,6 @@ · 8 unmodified lines
99 *
1010 * DMA uncached mapping support.
1111 */
12−#include <linux/bootmem.h>
1312 #include <linux/module.h>
1413 #include <linux/mm.h>
1514 #include <linux/genalloc.h>
arch/arm/mm/init.c+0−1
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #include <linux/errno.h>
1212 #include <linux/swap.h>
1313 #include <linux/init.h>
14−#include <linux/bootmem.h>
1514 #include <linux/mman.h>
1615 #include <linux/sched/signal.h>
1716 #include <linux/sched/task.h>
arch/arm/xen/mm.c+0−1
@@ -1,6 +1,5 @@
11 #include <linux/cpu.h>
22 #include <linux/dma-mapping.h>
3−#include <linux/bootmem.h>
43 #include <linux/gfp.h>
54 #include <linux/highmem.h>
65 #include <linux/export.h>
arch/arm/xen/p2m.c+1−1
@@ -1,4 +1,4 @@
1−#include <linux/bootmem.h>
1+#include <linux/memblock.h>
22 #include <linux/gfp.h>
33 #include <linux/export.h>
44 #include <linux/spinlock.h>
arch/arm64/kernel/acpi.c+0−1
@@ -16,7 +16,6 @@ · 15 unmodified lines
1616 #define pr_fmt(fmt) "ACPI: " fmt
1717
1818 #include <linux/acpi.h>
19−#include <linux/bootmem.h>
2019 #include <linux/cpumask.h>
2120 #include <linux/efi.h>
2221 #include <linux/efi-bgrt.h>
arch/arm64/kernel/acpi_numa.c+0−1
@@ -18,7 +18,6 @@ · 17 unmodified lines
1818
1919 #include <linux/acpi.h>
2020 #include <linux/bitmap.h>
21−#include <linux/bootmem.h>
2221 #include <linux/kernel.h>
2322 #include <linux/mm.h>
2423 #include <linux/memblock.h>
arch/arm64/kernel/setup.c+0−1
@@ -26,7 +26,6 @@ · 25 unmodified lines
2626 #include <linux/initrd.h>
2727 #include <linux/console.h>
2828 #include <linux/cache.h>
29−#include <linux/bootmem.h>
3029 #include <linux/screen_info.h>
3130 #include <linux/init.h>
3231 #include <linux/kexec.h>
arch/arm64/mm/dma-mapping.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919
2020 #include <linux/gfp.h>
2121 #include <linux/acpi.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/cache.h>
2424 #include <linux/export.h>
2525 #include <linux/slab.h>
arch/arm64/mm/init.c+0−1
@@ -22,7 +22,6 @@ · 21 unmodified lines
2222 #include <linux/errno.h>
2323 #include <linux/swap.h>
2424 #include <linux/init.h>
25−#include <linux/bootmem.h>
2625 #include <linux/cache.h>
2726 #include <linux/mman.h>
2827 #include <linux/nodemask.h>
arch/arm64/mm/kasan_init.c+0−1
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 */
1212
1313 #define pr_fmt(fmt) "kasan: " fmt
14−#include <linux/bootmem.h>
1514 #include <linux/kasan.h>
1615 #include <linux/kernel.h>
1716 #include <linux/sched/task.h>
arch/arm64/mm/numa.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #define pr_fmt(fmt) "NUMA: " fmt
2121
2222 #include <linux/acpi.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524 #include <linux/module.h>
2625 #include <linux/of.h>
arch/c6x/kernel/setup.c+0−1
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #include <linux/dma-mapping.h>
1212 #include <linux/memblock.h>
1313 #include <linux/seq_file.h>
14−#include <linux/bootmem.h>
1514 #include <linux/clkdev.h>
1615 #include <linux/initrd.h>
1716 #include <linux/kernel.h>
arch/c6x/mm/init.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 #include <linux/mm.h>
1212 #include <linux/swap.h>
1313 #include <linux/module.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #ifdef CONFIG_BLK_DEV_RAM
1616 #include <linux/blkdev.h>
1717 #endif
arch/h8300/kernel/setup.c+0−1
@@ -18,7 +18,6 @@ · 17 unmodified lines
1818 #include <linux/console.h>
1919 #include <linux/errno.h>
2020 #include <linux/string.h>
21−#include <linux/bootmem.h>
2221 #include <linux/seq_file.h>
2322 #include <linux/init.h>
2423 #include <linux/of.h>
arch/h8300/mm/init.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 #include <linux/init.h>
3131 #include <linux/highmem.h>
3232 #include <linux/pagemap.h>
33−#include <linux/bootmem.h>
33+#include <linux/memblock.h>
3434 #include <linux/gfp.h>
3535
3636 #include <asm/setup.h>
arch/hexagon/kernel/dma.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 */
2020
2121 #include <linux/dma-noncoherent.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/genalloc.h>
2424 #include <linux/module.h>
2525 #include <asm/page.h>
arch/hexagon/kernel/setup.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020
2121 #include <linux/init.h>
2222 #include <linux/delay.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/mmzone.h>
2525 #include <linux/mm.h>
2626 #include <linux/seq_file.h>
arch/hexagon/mm/init.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020
2121 #include <linux/init.h>
2222 #include <linux/mm.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524 #include <asm/atomic.h>
2625 #include <linux/highmem.h>
arch/ia64/kernel/crash.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #include <linux/smp.h>
1313 #include <linux/delay.h>
1414 #include <linux/crash_dump.h>
15−#include <linux/bootmem.h>
15+#include <linux/memblock.h>
1616 #include <linux/kexec.h>
1717 #include <linux/elfcore.h>
1818 #include <linux/sysctl.h>
arch/ia64/kernel/efi.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 * Skip non-WB memory and ignore empty memory ranges.
2424 */
2525 #include <linux/module.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/crash_dump.h>
2828 #include <linux/kernel.h>
2929 #include <linux/init.h>
arch/ia64/kernel/ia64_ksyms.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 #ifdef CONFIG_VIRTUAL_MEM_MAP
77 #include <linux/compiler.h>
88 #include <linux/export.h>
9−#include <linux/bootmem.h>
9+#include <linux/memblock.h>
1010 EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not exported by generic code */
1111 EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic code */
1212 #endif
arch/ia64/kernel/iosapic.c+1−1
@@ -90,7 +90,7 @@ · 89 unmodified lines
9090 #include <linux/slab.h>
9191 #include <linux/smp.h>
9292 #include <linux/string.h>
93−#include <linux/bootmem.h>
93+#include <linux/memblock.h>
9494
9595 #include <asm/delay.h>
9696 #include <asm/hw_irq.h>
arch/ia64/kernel/mca.c+1−1
@@ -77,7 +77,7 @@ · 76 unmodified lines
7777 #include <linux/sched/task.h>
7878 #include <linux/interrupt.h>
7979 #include <linux/irq.h>
80−#include <linux/bootmem.h>
80+#include <linux/memblock.h>
8181 #include <linux/acpi.h>
8282 #include <linux/timer.h>
8383 #include <linux/module.h>
arch/ia64/kernel/mca_drv.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 #include <linux/interrupt.h>
1515 #include <linux/irq.h>
1616 #include <linux/kallsyms.h>
17−#include <linux/bootmem.h>
17+#include <linux/memblock.h>
1818 #include <linux/acpi.h>
1919 #include <linux/timer.h>
2020 #include <linux/module.h>
arch/ia64/kernel/setup.c+0−1
@@ -27,7 +27,6 @@ · 26 unmodified lines
2727 #include <linux/init.h>
2828
2929 #include <linux/acpi.h>
30−#include <linux/bootmem.h>
3130 #include <linux/console.h>
3231 #include <linux/delay.h>
3332 #include <linux/cpu.h>
arch/ia64/kernel/smpboot.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424
2525 #include <linux/module.h>
2626 #include <linux/acpi.h>
27−#include <linux/bootmem.h>
27+#include <linux/memblock.h>
2828 #include <linux/cpu.h>
2929 #include <linux/delay.h>
3030 #include <linux/init.h>
arch/ia64/kernel/topology.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/node.h>
2020 #include <linux/slab.h>
2121 #include <linux/init.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/nodemask.h>
2424 #include <linux/notifier.h>
2525 #include <linux/export.h>
arch/ia64/kernel/unwind.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 * acquired, then the read-write lock must be acquired first.
2929 */
3030 #include <linux/module.h>
31−#include <linux/bootmem.h>
31+#include <linux/memblock.h>
3232 #include <linux/elf.h>
3333 #include <linux/kernel.h>
3434 #include <linux/sched.h>
arch/ia64/mm/contig.c+0−1
@@ -14,7 +14,6 @@ · 13 unmodified lines
1414 * Routines used by ia64 machines with contiguous (or virtually contiguous)
1515 * memory.
1616 */
17−#include <linux/bootmem.h>
1817 #include <linux/efi.h>
1918 #include <linux/memblock.h>
2019 #include <linux/mm.h>
arch/ia64/mm/discontig.c+0−1
@@ -19,7 +19,6 @@ · 18 unmodified lines
1919 #include <linux/mm.h>
2020 #include <linux/nmi.h>
2121 #include <linux/swap.h>
22−#include <linux/bootmem.h>
2322 #include <linux/memblock.h>
2423 #include <linux/acpi.h>
2524 #include <linux/efi.h>
arch/ia64/mm/init.c+0−1
@@ -8,7 +8,6 @@ · 7 unmodified lines
88 #include <linux/kernel.h>
99 #include <linux/init.h>
1010
11−#include <linux/bootmem.h>
1211 #include <linux/efi.h>
1312 #include <linux/elf.h>
1413 #include <linux/memblock.h>
arch/ia64/mm/numa.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/mm.h>
1616 #include <linux/node.h>
1717 #include <linux/init.h>
18−#include <linux/bootmem.h>
18+#include <linux/memblock.h>
1919 #include <linux/module.h>
2020 #include <asm/mmzone.h>
2121 #include <asm/numa.h>
arch/ia64/mm/tlb.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/sched.h>
2222 #include <linux/smp.h>
2323 #include <linux/mm.h>
24−#include <linux/bootmem.h>
24+#include <linux/memblock.h>
2525 #include <linux/slab.h>
2626
2727 #include <asm/delay.h>
arch/ia64/pci/pci.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <linux/ioport.h>
2121 #include <linux/slab.h>
2222 #include <linux/spinlock.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/export.h>
2525
2626 #include <asm/machvec.h>
arch/ia64/sn/kernel/bte.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <asm/nodedata.h>
1717 #include <asm/delay.h>
1818
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/string.h>
2121 #include <linux/sched.h>
2222 #include <linux/slab.h>
arch/ia64/sn/kernel/io_common.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Copyright (C) 2006 Silicon Graphics, Inc. All rights reserved.
77 */
88
9−#include <linux/bootmem.h>
9+#include <linux/memblock.h>
1010 #include <linux/export.h>
1111 #include <linux/slab.h>
1212 #include <asm/sn/types.h>
arch/ia64/sn/kernel/setup.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <linux/mm.h>
2121 #include <linux/serial.h>
2222 #include <linux/irq.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/mmzone.h>
2525 #include <linux/interrupt.h>
2626 #include <linux/acpi.h>
arch/m68k/atari/stram.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 #include <linux/slab.h>
1818 #include <linux/vmalloc.h>
1919 #include <linux/pagemap.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121 #include <linux/mount.h>
2222 #include <linux/blkdev.h>
2323 #include <linux/module.h>
arch/m68k/coldfire/m54xx.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/io.h>
1717 #include <linux/mm.h>
1818 #include <linux/clk.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <asm/pgalloc.h>
2121 #include <asm/machdep.h>
2222 #include <asm/coldfire.h>
arch/m68k/kernel/setup_mm.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #include <linux/errno.h>
2121 #include <linux/string.h>
2222 #include <linux/init.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524 #include <linux/proc_fs.h>
2625 #include <linux/seq_file.h>
arch/m68k/kernel/setup_no.c+0−1
@@ -27,7 +27,6 @@ · 26 unmodified lines
2727 #include <linux/console.h>
2828 #include <linux/errno.h>
2929 #include <linux/string.h>
30−#include <linux/bootmem.h>
3130 #include <linux/memblock.h>
3231 #include <linux/seq_file.h>
3332 #include <linux/init.h>
arch/m68k/kernel/uboot.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/console.h>
1717 #include <linux/errno.h>
1818 #include <linux/string.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/seq_file.h>
2121 #include <linux/init.h>
2222 #include <linux/initrd.h>
arch/m68k/mm/init.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 #include <linux/string.h>
1818 #include <linux/types.h>
1919 #include <linux/init.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121 #include <linux/gfp.h>
2222
2323 #include <asm/setup.h>
arch/m68k/mm/mcfmmu.c+0−1
@@ -13,7 +13,6 @@ · 12 unmodified lines
1313 #include <linux/mm.h>
1414 #include <linux/init.h>
1515 #include <linux/string.h>
16−#include <linux/bootmem.h>
1716 #include <linux/memblock.h>
1817
1918 #include <asm/setup.h>
arch/m68k/mm/motorola.c+0−1
@@ -18,7 +18,6 @@ · 17 unmodified lines
1818 #include <linux/string.h>
1919 #include <linux/types.h>
2020 #include <linux/init.h>
21−#include <linux/bootmem.h>
2221 #include <linux/memblock.h>
2322 #include <linux/gfp.h>
2423
arch/m68k/mm/sun3mmu.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/string.h>
1717 #include <linux/types.h>
1818 #include <linux/init.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020
2121 #include <asm/setup.h>
2222 #include <linux/uaccess.h>
arch/m68k/sun3/config.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/tty.h>
1616 #include <linux/console.h>
1717 #include <linux/init.h>
18−#include <linux/bootmem.h>
18+#include <linux/memblock.h>
1919 #include <linux/platform_device.h>
2020
2121 #include <asm/oplib.h>
arch/m68k/sun3/dvma.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 #include <linux/init.h>
1212 #include <linux/kernel.h>
1313 #include <linux/mm.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/list.h>
1616 #include <asm/page.h>
1717 #include <asm/pgtable.h>
arch/m68k/sun3/mmu_emu.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #include <linux/kernel.h>
1414 #include <linux/ptrace.h>
1515 #include <linux/delay.h>
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717 #include <linux/bitops.h>
1818 #include <linux/module.h>
1919 #include <linux/sched/mm.h>
arch/m68k/sun3/sun3dvma.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 * Contains common routines for sun3/sun3x DVMA management.
88 */
99
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/init.h>
1212 #include <linux/module.h>
1313 #include <linux/kernel.h>
arch/m68k/sun3x/dvma.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/init.h>
1616 #include <linux/bitops.h>
1717 #include <linux/mm.h>
18−#include <linux/bootmem.h>
18+#include <linux/memblock.h>
1919 #include <linux/vmalloc.h>
2020
2121 #include <asm/sun3x.h>
arch/microblaze/mm/consistent.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <linux/vmalloc.h>
2929 #include <linux/init.h>
3030 #include <linux/delay.h>
31−#include <linux/bootmem.h>
31+#include <linux/memblock.h>
3232 #include <linux/highmem.h>
3333 #include <linux/pci.h>
3434 #include <linux/interrupt.h>
arch/microblaze/mm/init.c+1−2
@@ -7,10 +7,9 @@ · 6 unmodified lines
77 * for more details.
88 */
99
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/init.h>
1212 #include <linux/kernel.h>
13−#include <linux/memblock.h>
1413 #include <linux/mm.h> /* mem_init */
1514 #include <linux/initrd.h>
1615 #include <linux/pagemap.h>
arch/microblaze/pci/pci-common.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <linux/pci.h>
2121 #include <linux/string.h>
2222 #include <linux/init.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/mm.h>
2525 #include <linux/shmem_fs.h>
2626 #include <linux/list.h>
arch/mips/ar7/memory.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 * along with this program; if not, write to the Free Software
1717 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818 */
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/init.h>
2121 #include <linux/mm.h>
2222 #include <linux/pfn.h>
arch/mips/ath79/setup.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414
1515 #include <linux/kernel.h>
1616 #include <linux/init.h>
17−#include <linux/bootmem.h>
17+#include <linux/memblock.h>
1818 #include <linux/err.h>
1919 #include <linux/clk.h>
2020 #include <linux/clk-provider.h>
arch/mips/bcm63xx/prom.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 */
88
99 #include <linux/init.h>
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/smp.h>
1212 #include <asm/bootinfo.h>
1313 #include <asm/bmips.h>
arch/mips/bcm63xx/setup.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 #include <linux/init.h>
1010 #include <linux/kernel.h>
1111 #include <linux/delay.h>
12−#include <linux/bootmem.h>
12+#include <linux/memblock.h>
1313 #include <linux/ioport.h>
1414 #include <linux/pm.h>
1515 #include <asm/bootinfo.h>
arch/mips/bmips/setup.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/init.h>
1111 #include <linux/bitops.h>
12−#include <linux/bootmem.h>
12+#include <linux/memblock.h>
1313 #include <linux/clk-provider.h>
1414 #include <linux/ioport.h>
1515 #include <linux/kernel.h>
arch/mips/cavium-octeon/dma-octeon.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 * Copyright (C) 2010 Cavium Networks, Inc.
1212 */
1313 #include <linux/dma-direct.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/swiotlb.h>
1616 #include <linux/types.h>
1717 #include <linux/init.h>
arch/mips/dec/prom/memory.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #include <linux/init.h>
99 #include <linux/kernel.h>
1010 #include <linux/mm.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/types.h>
1313
1414 #include <asm/addrspace.h>
arch/mips/emma/common/prom.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <linux/init.h>
2323 #include <linux/mm.h>
2424 #include <linux/sched.h>
25−#include <linux/bootmem.h>
25+#include <linux/memblock.h>
2626
2727 #include <asm/addrspace.h>
2828 #include <asm/bootinfo.h>
arch/mips/fw/arc/memory.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 #include <linux/types.h>
1818 #include <linux/sched.h>
1919 #include <linux/mm.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121 #include <linux/swap.h>
2222
2323 #include <asm/sgialib.h>
arch/mips/jazz/jazzdma.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #include <linux/export.h>
1414 #include <linux/errno.h>
1515 #include <linux/mm.h>
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717 #include <linux/spinlock.h>
1818 #include <linux/gfp.h>
1919 #include <linux/dma-direct.h>
arch/mips/kernel/crash.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 #include <linux/smp.h>
44 #include <linux/reboot.h>
55 #include <linux/kexec.h>
6−#include <linux/bootmem.h>
6+#include <linux/memblock.h>
77 #include <linux/crash_dump.h>
88 #include <linux/delay.h>
99 #include <linux/irq.h>
arch/mips/kernel/crash_dump.c+1−1
@@ -1,6 +1,6 @@
11 // SPDX-License-Identifier: GPL-2.0
22 #include <linux/highmem.h>
3−#include <linux/bootmem.h>
3+#include <linux/memblock.h>
44 #include <linux/crash_dump.h>
55 #include <linux/uaccess.h>
66 #include <linux/slab.h>
arch/mips/kernel/prom.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #include <linux/export.h>
1313 #include <linux/errno.h>
1414 #include <linux/types.h>
15−#include <linux/bootmem.h>
15+#include <linux/memblock.h>
1616 #include <linux/debugfs.h>
1717 #include <linux/of.h>
1818 #include <linux/of_fdt.h>
arch/mips/kernel/setup.c+0−1
@@ -15,7 +15,6 @@ · 14 unmodified lines
1515 #include <linux/export.h>
1616 #include <linux/screen_info.h>
1717 #include <linux/memblock.h>
18−#include <linux/bootmem.h>
1918 #include <linux/initrd.h>
2019 #include <linux/root_dev.h>
2120 #include <linux/highmem.h>
arch/mips/kernel/traps.c+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
2828 #include <linux/smp.h>
2929 #include <linux/spinlock.h>
3030 #include <linux/kallsyms.h>
31−#include <linux/bootmem.h>
3231 #include <linux/memblock.h>
3332 #include <linux/interrupt.h>
3433 #include <linux/ptrace.h>
arch/mips/kernel/vpe.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <linux/moduleloader.h>
2727 #include <linux/interrupt.h>
2828 #include <linux/poll.h>
29−#include <linux/bootmem.h>
29+#include <linux/memblock.h>
3030 #include <asm/mipsregs.h>
3131 #include <asm/mipsmtregs.h>
3232 #include <asm/cacheflush.h>
arch/mips/kvm/commpage.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 #include <linux/err.h>
1515 #include <linux/vmalloc.h>
1616 #include <linux/fs.h>
17−#include <linux/bootmem.h>
17+#include <linux/memblock.h>
1818 #include <asm/page.h>
1919 #include <asm/cacheflush.h>
2020 #include <asm/mmu_context.h>
arch/mips/kvm/dyntrans.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/uaccess.h>
1717 #include <linux/vmalloc.h>
1818 #include <linux/fs.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <asm/cacheflush.h>
2121
2222 #include "commpage.h"
arch/mips/kvm/emulate.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/kvm_host.h>
1616 #include <linux/vmalloc.h>
1717 #include <linux/fs.h>
18−#include <linux/bootmem.h>
18+#include <linux/memblock.h>
1919 #include <linux/random.h>
2020 #include <asm/page.h>
2121 #include <asm/cacheflush.h>
arch/mips/kvm/interrupt.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #include <linux/err.h>
1414 #include <linux/vmalloc.h>
1515 #include <linux/fs.h>
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717 #include <asm/page.h>
1818 #include <asm/cacheflush.h>
1919
arch/mips/kvm/mips.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/vmalloc.h>
1919 #include <linux/sched/signal.h>
2020 #include <linux/fs.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222
2323 #include <asm/fpu.h>
2424 #include <asm/page.h>
arch/mips/lantiq/prom.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88
99 #include <linux/export.h>
1010 #include <linux/clk.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/of_fdt.h>
1313
1414 #include <asm/bootinfo.h>
arch/mips/lasat/prom.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #include <linux/ctype.h>
99 #include <linux/kernel.h>
1010 #include <linux/mm.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/ioport.h>
1313 #include <asm/bootinfo.h>
1414 #include <asm/lasat/lasat.h>
arch/mips/loongson64/common/init.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 * option) any later version.
99 */
1010
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <asm/bootinfo.h>
1313 #include <asm/traps.h>
1414 #include <asm/smp-ops.h>
arch/mips/loongson64/loongson-3/numa.c+0−1
@@ -18,7 +18,6 @@ · 17 unmodified lines
1818 #include <linux/nodemask.h>
1919 #include <linux/swap.h>
2020 #include <linux/memblock.h>
21−#include <linux/bootmem.h>
2221 #include <linux/pfn.h>
2322 #include <linux/highmem.h>
2423 #include <asm/page.h>
arch/mips/mm/init.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <linux/ptrace.h>
2323 #include <linux/mman.h>
2424 #include <linux/mm.h>
25−#include <linux/bootmem.h>
25+#include <linux/memblock.h>
2626 #include <linux/highmem.h>
2727 #include <linux/swap.h>
2828 #include <linux/proc_fs.h>
arch/mips/mm/pgtable-32.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 */
88 #include <linux/init.h>
99 #include <linux/mm.h>
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/highmem.h>
1212 #include <asm/fixmap.h>
1313 #include <asm/pgtable.h>
arch/mips/mti-malta/malta-memory.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 * Steven J. Hill <sjhill@mips.com>
1313 */
1414 #include <linux/init.h>
15−#include <linux/bootmem.h>
15+#include <linux/memblock.h>
1616 #include <linux/string.h>
1717
1818 #include <asm/bootinfo.h>
arch/mips/netlogic/xlp/dt.c+1−1
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333 */
3434
3535 #include <linux/kernel.h>
36−#include <linux/bootmem.h>
36+#include <linux/memblock.h>
3737
3838 #include <linux/of_fdt.h>
3939 #include <linux/of_platform.h>
arch/mips/pci/pci-legacy.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 #include <linux/bug.h>
1212 #include <linux/kernel.h>
1313 #include <linux/mm.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/export.h>
1616 #include <linux/init.h>
1717 #include <linux/types.h>
arch/mips/pci/pci.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 #include <linux/bug.h>
1212 #include <linux/kernel.h>
1313 #include <linux/mm.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/export.h>
1616 #include <linux/init.h>
1717 #include <linux/types.h>
arch/mips/ralink/of.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 #include <linux/sizes.h>
1515 #include <linux/of_fdt.h>
1616 #include <linux/kernel.h>
17−#include <linux/bootmem.h>
17+#include <linux/memblock.h>
1818 #include <linux/of_platform.h>
1919 #include <linux/of_address.h>
2020
arch/mips/rb532/prom.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #include <linux/export.h>
3030 #include <linux/string.h>
3131 #include <linux/console.h>
32−#include <linux/bootmem.h>
32+#include <linux/memblock.h>
3333 #include <linux/ioport.h>
3434 #include <linux/blkdev.h>
3535
arch/mips/sgi-ip27/ip27-memory.c+0−1
@@ -18,7 +18,6 @@ · 17 unmodified lines
1818 #include <linux/export.h>
1919 #include <linux/nodemask.h>
2020 #include <linux/swap.h>
21−#include <linux/bootmem.h>
2221 #include <linux/pfn.h>
2322 #include <linux/highmem.h>
2423 #include <asm/page.h>
arch/mips/sibyte/common/cfe.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/linkage.h>
2222 #include <linux/mm.h>
2323 #include <linux/blkdev.h>
24−#include <linux/bootmem.h>
24+#include <linux/memblock.h>
2525 #include <linux/pm.h>
2626 #include <linux/smp.h>
2727
arch/mips/sibyte/swarm/setup.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323
2424 #include <linux/spinlock.h>
2525 #include <linux/mm.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/blkdev.h>
2828 #include <linux/init.h>
2929 #include <linux/kernel.h>
arch/mips/txx9/rbtx4938/prom.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 */
1212
1313 #include <linux/init.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <asm/bootinfo.h>
1616 #include <asm/txx9/generic.h>
1717 #include <asm/txx9/rbtx4938.h>
arch/nds32/kernel/setup.c+1−2
@@ -2,9 +2,8 @@ · 1 unmodified line
22 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #include <linux/cpu.h>
5−#include <linux/bootmem.h>
6−#include <linux/seq_file.h>
75 #include <linux/memblock.h>
6+#include <linux/seq_file.h>
87 #include <linux/console.h>
98 #include <linux/screen_info.h>
109 #include <linux/delay.h>
arch/nds32/mm/highmem.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 #include <linux/sched.h>
77 #include <linux/smp.h>
88 #include <linux/interrupt.h>
9−#include <linux/bootmem.h>
9+#include <linux/memblock.h>
1010 #include <asm/fixmap.h>
1111 #include <asm/tlbflush.h>
1212
arch/nds32/mm/init.c+1−2
@@ -7,12 +7,11 @@ · 6 unmodified lines
77 #include <linux/errno.h>
88 #include <linux/swap.h>
99 #include <linux/init.h>
10−#include <linux/bootmem.h>
10+#include <linux/memblock.h>
1111 #include <linux/mman.h>
1212 #include <linux/nodemask.h>
1313 #include <linux/initrd.h>
1414 #include <linux/highmem.h>
15−#include <linux/memblock.h>
1615
1716 #include <asm/sections.h>
1817 #include <asm/setup.h>
arch/nios2/kernel/prom.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525
2626 #include <linux/init.h>
2727 #include <linux/types.h>
28−#include <linux/bootmem.h>
28+#include <linux/memblock.h>
2929 #include <linux/of.h>
3030 #include <linux/of_fdt.h>
3131 #include <linux/io.h>
arch/nios2/kernel/setup.c+0−1
@@ -16,7 +16,6 @@ · 15 unmodified lines
1616 #include <linux/sched.h>
1717 #include <linux/sched/task.h>
1818 #include <linux/console.h>
19−#include <linux/bootmem.h>
2019 #include <linux/memblock.h>
2120 #include <linux/initrd.h>
2221 #include <linux/of_fdt.h>
arch/nios2/mm/init.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/mm.h>
2424 #include <linux/init.h>
2525 #include <linux/pagemap.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/slab.h>
2828 #include <linux/binfmts.h>
2929
arch/openrisc/kernel/setup.c+1−2
@@ -30,13 +30,12 @@ · 29 unmodified lines
3030 #include <linux/delay.h>
3131 #include <linux/console.h>
3232 #include <linux/init.h>
33−#include <linux/bootmem.h>
33+#include <linux/memblock.h>
3434 #include <linux/seq_file.h>
3535 #include <linux/serial.h>
3636 #include <linux/initrd.h>
3737 #include <linux/of_fdt.h>
3838 #include <linux/of.h>
39−#include <linux/memblock.h>
4039 #include <linux/device.h>
4140
4241 #include <asm/sections.h>
arch/openrisc/mm/init.c+1−2
@@ -26,12 +26,11 @@ · 25 unmodified lines
2626 #include <linux/mm.h>
2727 #include <linux/swap.h>
2828 #include <linux/smp.h>
29−#include <linux/bootmem.h>
29+#include <linux/memblock.h>
3030 #include <linux/init.h>
3131 #include <linux/delay.h>
3232 #include <linux/blkdev.h> /* for initrd_* */
3333 #include <linux/pagemap.h>
34−#include <linux/memblock.h>
3534
3635 #include <asm/segment.h>
3736 #include <asm/pgalloc.h>
arch/parisc/mm/init.c+0−1
@@ -14,7 +14,6 @@ · 13 unmodified lines
1414
1515 #include <linux/module.h>
1616 #include <linux/mm.h>
17−#include <linux/bootmem.h>
1817 #include <linux/memblock.h>
1918 #include <linux/gfp.h>
2019 #include <linux/delay.h>
arch/powerpc/kernel/pci_32.c+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
1010 #include <linux/capability.h>
1111 #include <linux/sched.h>
1212 #include <linux/errno.h>
13−#include <linux/bootmem.h>
13+#include <linux/memblock.h>
1414 #include <linux/syscalls.h>
1515 #include <linux/irq.h>
1616 #include <linux/list.h>
arch/powerpc/kernel/setup-common.c+0−1
@@ -33,7 +33,6 @@ · 32 unmodified lines
3333 #include <linux/serial_8250.h>
3434 #include <linux/percpu.h>
3535 #include <linux/memblock.h>
36−#include <linux/bootmem.h>
3736 #include <linux/of_platform.h>
3837 #include <linux/hugetlb.h>
3938 #include <asm/debugfs.h>
arch/powerpc/kernel/setup_64.c+1−2
@@ -29,10 +29,9 @@ · 28 unmodified lines
2929 #include <linux/unistd.h>
3030 #include <linux/serial.h>
3131 #include <linux/serial_8250.h>
32−#include <linux/bootmem.h>
32+#include <linux/memblock.h>
3333 #include <linux/pci.h>
3434 #include <linux/lockdep.h>
35−#include <linux/memblock.h>
3635 #include <linux/memory.h>
3736 #include <linux/nmi.h>
3837
arch/powerpc/lib/alloc.c+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 #include <linux/types.h>
33 #include <linux/init.h>
44 #include <linux/slab.h>
5−#include <linux/bootmem.h>
5+#include <linux/memblock.h>
66 #include <linux/string.h>
77 #include <asm/setup.h>
88
arch/powerpc/mm/hugetlbpage.c+0−1
@@ -15,7 +15,6 @@ · 14 unmodified lines
1515 #include <linux/export.h>
1616 #include <linux/of_fdt.h>
1717 #include <linux/memblock.h>
18−#include <linux/bootmem.h>
1918 #include <linux/moduleparam.h>
2019 #include <linux/swap.h>
2120 #include <linux/swapops.h>
arch/powerpc/mm/mem.c+1−2
@@ -27,12 +27,11 @@ · 26 unmodified lines
2727 #include <linux/mm.h>
2828 #include <linux/stddef.h>
2929 #include <linux/init.h>
30−#include <linux/bootmem.h>
30+#include <linux/memblock.h>
3131 #include <linux/highmem.h>
3232 #include <linux/initrd.h>
3333 #include <linux/pagemap.h>
3434 #include <linux/suspend.h>
35−#include <linux/memblock.h>
3635 #include <linux/hugetlb.h>
3736 #include <linux/slab.h>
3837 #include <linux/vmalloc.h>
arch/powerpc/mm/mmu_context_nohash.c+1−1
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444 #include <linux/mm.h>
4545 #include <linux/init.h>
4646 #include <linux/spinlock.h>
47−#include <linux/bootmem.h>
47+#include <linux/memblock.h>
4848 #include <linux/notifier.h>
4949 #include <linux/cpu.h>
5050 #include <linux/slab.h>
arch/powerpc/mm/numa.c+1−2
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 #define pr_fmt(fmt) "numa: " fmt
1212
1313 #include <linux/threads.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/init.h>
1616 #include <linux/mm.h>
1717 #include <linux/mmzone.h>
@@ -19,7 +19,6 @@ · 1 unmodified line
1919 #include <linux/nodemask.h>
2020 #include <linux/cpu.h>
2121 #include <linux/notifier.h>
22−#include <linux/memblock.h>
2322 #include <linux/of.h>
2423 #include <linux/pfn.h>
2524 #include <linux/cpuset.h>
arch/powerpc/platforms/powermac/nvram.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/errno.h>
1919 #include <linux/adb.h>
2020 #include <linux/pmu.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222 #include <linux/completion.h>
2323 #include <linux/spinlock.h>
2424 #include <asm/sections.h>
arch/powerpc/platforms/powernv/pci-ioda.c+1−2
@@ -17,11 +17,10 @@ · 16 unmodified lines
1717 #include <linux/delay.h>
1818 #include <linux/string.h>
1919 #include <linux/init.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121 #include <linux/irq.h>
2222 #include <linux/io.h>
2323 #include <linux/msi.h>
24−#include <linux/memblock.h>
2524 #include <linux/iommu.h>
2625 #include <linux/rculist.h>
2726 #include <linux/sizes.h>
arch/powerpc/platforms/ps3/setup.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <linux/root_dev.h>
2525 #include <linux/console.h>
2626 #include <linux/export.h>
27−#include <linux/bootmem.h>
27+#include <linux/memblock.h>
2828
2929 #include <asm/machdep.h>
3030 #include <asm/firmware.h>
arch/powerpc/sysdev/msi_bitmap.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #include <linux/kernel.h>
1313 #include <linux/kmemleak.h>
1414 #include <linux/bitmap.h>
15−#include <linux/bootmem.h>
15+#include <linux/memblock.h>
1616 #include <asm/msi_bitmap.h>
1717 #include <asm/setup.h>
1818
arch/riscv/mm/init.c+1−2
@@ -13,9 +13,8 @@ · 12 unmodified lines
1313
1414 #include <linux/init.h>
1515 #include <linux/mm.h>
16−#include <linux/bootmem.h>
17−#include <linux/initrd.h>
1816 #include <linux/memblock.h>
17+#include <linux/initrd.h>
1918 #include <linux/swap.h>
2019 #include <linux/sizes.h>
2120
arch/s390/kernel/crash_dump.c+1−2
@@ -13,10 +13,9 @@ · 12 unmodified lines
1313 #include <linux/mm.h>
1414 #include <linux/gfp.h>
1515 #include <linux/slab.h>
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717 #include <linux/elf.h>
1818 #include <asm/asm-offsets.h>
19−#include <linux/memblock.h>
2019 #include <asm/os_info.h>
2120 #include <asm/elf.h>
2221 #include <asm/ipl.h>
arch/s390/kernel/setup.c+0−1
@@ -34,7 +34,6 @@ · 33 unmodified lines
3434 #include <linux/delay.h>
3535 #include <linux/init.h>
3636 #include <linux/initrd.h>
37−#include <linux/bootmem.h>
3837 #include <linux/root_dev.h>
3938 #include <linux/console.h>
4039 #include <linux/kernel_stat.h>
arch/s390/kernel/smp.c+1−2
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
2121
2222 #include <linux/workqueue.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/export.h>
2525 #include <linux/init.h>
2626 #include <linux/mm.h>
@@ -35,7 +35,6 @@ · 8 unmodified lines
3535 #include <linux/sched/hotplug.h>
3636 #include <linux/sched/task_stack.h>
3737 #include <linux/crash_dump.h>
38−#include <linux/memblock.h>
3938 #include <linux/kprobes.h>
4039 #include <asm/asm-offsets.h>
4140 #include <asm/diag.h>
arch/s390/kernel/topology.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
99
1010 #include <linux/workqueue.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/uaccess.h>
1313 #include <linux/sysctl.h>
1414 #include <linux/cpuset.h>
arch/s390/kernel/vdso.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/user.h>
1919 #include <linux/elf.h>
2020 #include <linux/security.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222 #include <linux/compat.h>
2323 #include <asm/asm-offsets.h>
2424 #include <asm/pgtable.h>
arch/s390/mm/extmem.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/list.h>
1717 #include <linux/slab.h>
1818 #include <linux/export.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/ctype.h>
2121 #include <linux/ioport.h>
2222 #include <asm/diag.h>
arch/s390/mm/init.c+1−2
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/smp.h>
2222 #include <linux/init.h>
2323 #include <linux/pagemap.h>
24−#include <linux/bootmem.h>
24+#include <linux/memblock.h>
2525 #include <linux/memory.h>
2626 #include <linux/pfn.h>
2727 #include <linux/poison.h>
@@ -29,7 +29,6 @@ · 1 unmodified line
2929 #include <linux/export.h>
3030 #include <linux/cma.h>
3131 #include <linux/gfp.h>
32−#include <linux/memblock.h>
3332 #include <asm/processor.h>
3433 #include <linux/uaccess.h>
3534 #include <asm/pgtable.h>
arch/s390/mm/vmem.c+1−2
@@ -4,14 +4,13 @@ · 3 unmodified lines
44 * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
55 */
66
7−#include <linux/bootmem.h>
7+#include <linux/memblock.h>
88 #include <linux/pfn.h>
99 #include <linux/mm.h>
1010 #include <linux/init.h>
1111 #include <linux/list.h>
1212 #include <linux/hugetlb.h>
1313 #include <linux/slab.h>
14−#include <linux/memblock.h>
1514 #include <asm/cacheflush.h>
1615 #include <asm/pgalloc.h>
1716 #include <asm/pgtable.h>
arch/s390/numa/mode_emu.c+0−1
@@ -22,7 +22,6 @@ · 21 unmodified lines
2222 #include <linux/kernel.h>
2323 #include <linux/cpumask.h>
2424 #include <linux/memblock.h>
25−#include <linux/bootmem.h>
2625 #include <linux/node.h>
2726 #include <linux/memory.h>
2827 #include <linux/slab.h>
arch/s390/numa/numa.c+0−1
@@ -13,7 +13,6 @@ · 12 unmodified lines
1313 #include <linux/kernel.h>
1414 #include <linux/mmzone.h>
1515 #include <linux/cpumask.h>
16−#include <linux/bootmem.h>
1716 #include <linux/memblock.h>
1817 #include <linux/slab.h>
1918 #include <linux/node.h>
arch/s390/numa/toptree.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 */
99
1010 #include <linux/kernel.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/cpumask.h>
1313 #include <linux/list.h>
1414 #include <linux/list_sort.h>
arch/sh/mm/init.c+1−2
@@ -11,12 +11,11 @@ · 10 unmodified lines
1111 #include <linux/swap.h>
1212 #include <linux/init.h>
1313 #include <linux/gfp.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/proc_fs.h>
1616 #include <linux/pagemap.h>
1717 #include <linux/percpu.h>
1818 #include <linux/io.h>
19−#include <linux/memblock.h>
2019 #include <linux/dma-mapping.h>
2120 #include <linux/export.h>
2221 #include <asm/mmu_context.h>
arch/sh/mm/ioremap_fixed.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 #include <linux/module.h>
1515 #include <linux/mm.h>
1616 #include <linux/io.h>
17−#include <linux/bootmem.h>
17+#include <linux/memblock.h>
1818 #include <linux/proc_fs.h>
1919 #include <asm/fixmap.h>
2020 #include <asm/page.h>
arch/sparc/kernel/mdesc.c+0−2
@@ -5,13 +5,11 @@ · 4 unmodified lines
55 */
66 #include <linux/kernel.h>
77 #include <linux/types.h>
8−#include <linux/memblock.h>
98 #include <linux/log2.h>
109 #include <linux/list.h>
1110 #include <linux/slab.h>
1211 #include <linux/mm.h>
1312 #include <linux/miscdevice.h>
14−#include <linux/bootmem.h>
1513 #include <linux/memblock.h>
1614 #include <linux/export.h>
1715 #include <linux/refcount.h>
arch/sparc/kernel/prom_32.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/types.h>
2020 #include <linux/string.h>
2121 #include <linux/mm.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323
2424 #include <asm/prom.h>
2525 #include <asm/oplib.h>
arch/sparc/kernel/setup_64.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <linux/initrd.h>
3333 #include <linux/module.h>
3434 #include <linux/start_kernel.h>
35−#include <linux/bootmem.h>
35+#include <linux/memblock.h>
3636
3737 #include <asm/io.h>
3838 #include <asm/processor.h>
arch/sparc/kernel/smp_64.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <linux/cache.h>
2323 #include <linux/jiffies.h>
2424 #include <linux/profile.h>
25−#include <linux/bootmem.h>
25+#include <linux/memblock.h>
2626 #include <linux/vmalloc.h>
2727 #include <linux/ftrace.h>
2828 #include <linux/cpu.h>
arch/sparc/mm/init_32.c+0−1
@@ -22,7 +22,6 @@ · 21 unmodified lines
2222 #include <linux/initrd.h>
2323 #include <linux/init.h>
2424 #include <linux/highmem.h>
25−#include <linux/bootmem.h>
2625 #include <linux/memblock.h>
2726 #include <linux/pagemap.h>
2827 #include <linux/poison.h>
arch/sparc/mm/init_64.c+1−2
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 #include <linux/sched.h>
1212 #include <linux/string.h>
1313 #include <linux/init.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/mm.h>
1616 #include <linux/hugetlb.h>
1717 #include <linux/initrd.h>
@@ -25,7 +25,6 @@ · 7 unmodified lines
2525 #include <linux/sort.h>
2626 #include <linux/ioport.h>
2727 #include <linux/percpu.h>
28−#include <linux/memblock.h>
2928 #include <linux/mmzone.h>
3029 #include <linux/gfp.h>
3130
arch/sparc/mm/srmmu.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111
1212 #include <linux/seq_file.h>
1313 #include <linux/spinlock.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/pagemap.h>
1616 #include <linux/vmalloc.h>
1717 #include <linux/kdebug.h>
arch/um/drivers/net_kern.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Licensed under the GPL.
77 */
88
9−#include <linux/bootmem.h>
9+#include <linux/memblock.h>
1010 #include <linux/etherdevice.h>
1111 #include <linux/ethtool.h>
1212 #include <linux/inetdevice.h>
arch/um/drivers/vector_kern.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 */
1010
1111 #include <linux/version.h>
12−#include <linux/bootmem.h>
12+#include <linux/memblock.h>
1313 #include <linux/etherdevice.h>
1414 #include <linux/ethtool.h>
1515 #include <linux/inetdevice.h>
arch/um/kernel/initrd.c+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 */
55
66 #include <linux/init.h>
7−#include <linux/bootmem.h>
7+#include <linux/memblock.h>
88 #include <linux/initrd.h>
99 #include <asm/types.h>
1010 #include <init.h>
arch/um/kernel/mem.c+0−1
@@ -5,7 +5,6 @@ · 4 unmodified lines
55
66 #include <linux/stddef.h>
77 #include <linux/module.h>
8−#include <linux/bootmem.h>
98 #include <linux/memblock.h>
109 #include <linux/highmem.h>
1110 #include <linux/mm.h>
arch/um/kernel/physmem.c+0−1
@@ -4,7 +4,6 @@ · 3 unmodified lines
44 */
55
66 #include <linux/module.h>
7−#include <linux/bootmem.h>
87 #include <linux/memblock.h>
98 #include <linux/mm.h>
109 #include <linux/pfn.h>
arch/unicore32/kernel/hibernate.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313
1414 #include <linux/gfp.h>
1515 #include <linux/suspend.h>
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717
1818 #include <asm/page.h>
1919 #include <asm/pgtable.h>
arch/unicore32/kernel/setup.c+1−2
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 #include <linux/utsname.h>
1818 #include <linux/initrd.h>
1919 #include <linux/console.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121 #include <linux/seq_file.h>
2222 #include <linux/screen_info.h>
2323 #include <linux/init.h>
@@ -27,7 +27,6 @@ · 3 unmodified lines
2727 #include <linux/smp.h>
2828 #include <linux/fs.h>
2929 #include <linux/proc_fs.h>
30−#include <linux/memblock.h>
3130 #include <linux/elf.h>
3231 #include <linux/io.h>
3332
arch/unicore32/mm/init.c+1−2
@@ -11,13 +11,12 @@ · 10 unmodified lines
1111 #include <linux/errno.h>
1212 #include <linux/swap.h>
1313 #include <linux/init.h>
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/mman.h>
1616 #include <linux/nodemask.h>
1717 #include <linux/initrd.h>
1818 #include <linux/highmem.h>
1919 #include <linux/gfp.h>
20−#include <linux/memblock.h>
2120 #include <linux/sort.h>
2221 #include <linux/dma-mapping.h>
2322 #include <linux/export.h>
arch/unicore32/mm/mmu.c+0−1
@@ -17,7 +17,6 @@ · 16 unmodified lines
1717 #include <linux/nodemask.h>
1818 #include <linux/memblock.h>
1919 #include <linux/fs.h>
20−#include <linux/bootmem.h>
2120 #include <linux/io.h>
2221
2322 #include <asm/cputype.h>
arch/x86/kernel/acpi/boot.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <linux/dmi.h>
3333 #include <linux/irq.h>
3434 #include <linux/slab.h>
35−#include <linux/bootmem.h>
35+#include <linux/memblock.h>
3636 #include <linux/ioport.h>
3737 #include <linux/pci.h>
3838 #include <linux/efi-bgrt.h>
arch/x86/kernel/acpi/sleep.c+0−1
@@ -7,7 +7,6 @@ · 6 unmodified lines
77 */
88
99 #include <linux/acpi.h>
10−#include <linux/bootmem.h>
1110 #include <linux/memblock.h>
1211 #include <linux/dmi.h>
1312 #include <linux/cpumask.h>
arch/x86/kernel/apic/apic.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <linux/acpi_pmtmr.h>
2121 #include <linux/clockchips.h>
2222 #include <linux/interrupt.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/ftrace.h>
2525 #include <linux/ioport.h>
2626 #include <linux/export.h>
arch/x86/kernel/apic/io_apic.c+1−1
@@ -47,7 +47,7 @@ · 46 unmodified lines
4747 #include <linux/kthread.h>
4848 #include <linux/jiffies.h> /* time_after() */
4949 #include <linux/slab.h>
50−#include <linux/bootmem.h>
50+#include <linux/memblock.h>
5151
5252 #include <asm/irqdomain.h>
5353 #include <asm/io.h>
arch/x86/kernel/cpu/common.c+1−1
@@ -1,7 +1,7 @@
11 /* cpu_feature_enabled() cannot be used this early */
22 #define USE_EARLY_PGTABLE_L5
33
4−#include <linux/bootmem.h>
4+#include <linux/memblock.h>
55 #include <linux/linkage.h>
66 #include <linux/bitops.h>
77 #include <linux/kernel.h>
arch/x86/kernel/e820.c+1−2
@@ -9,11 +9,10 @@ · 8 unmodified lines
99 * allocation code routines via a platform independent interface (memblock, etc.).
1010 */
1111 #include <linux/crash_dump.h>
12−#include <linux/bootmem.h>
12+#include <linux/memblock.h>
1313 #include <linux/suspend.h>
1414 #include <linux/acpi.h>
1515 #include <linux/firmware-map.h>
16−#include <linux/memblock.h>
1716 #include <linux/sort.h>
1817
1918 #include <asm/e820/api.h>
arch/x86/kernel/mpparse.c+0−1
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #include <linux/mm.h>
1212 #include <linux/init.h>
1313 #include <linux/delay.h>
14−#include <linux/bootmem.h>
1514 #include <linux/memblock.h>
1615 #include <linux/kernel_stat.h>
1716 #include <linux/mc146818rtc.h>
arch/x86/kernel/pci-dma.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 #include <linux/dma-debug.h>
44 #include <linux/dmar.h>
55 #include <linux/export.h>
6−#include <linux/bootmem.h>
6+#include <linux/memblock.h>
77 #include <linux/gfp.h>
88 #include <linux/pci.h>
99
arch/x86/kernel/pci-swiotlb.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 #include <linux/cache.h>
66 #include <linux/init.h>
77 #include <linux/swiotlb.h>
8−#include <linux/bootmem.h>
8+#include <linux/memblock.h>
99 #include <linux/dma-direct.h>
1010 #include <linux/mem_encrypt.h>
1111
arch/x86/kernel/pvclock.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <linux/notifier.h>
2121 #include <linux/sched.h>
2222 #include <linux/gfp.h>
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/nmi.h>
2525
2626 #include <asm/fixmap.h>
arch/x86/kernel/setup.c+0−1
@@ -30,7 +30,6 @@ · 29 unmodified lines
3030 #include <linux/sfi.h>
3131 #include <linux/apm_bios.h>
3232 #include <linux/initrd.h>
33−#include <linux/bootmem.h>
3433 #include <linux/memblock.h>
3534 #include <linux/seq_file.h>
3635 #include <linux/console.h>
arch/x86/kernel/setup_percpu.c+0−1
@@ -4,7 +4,6 @@ · 3 unmodified lines
44 #include <linux/kernel.h>
55 #include <linux/export.h>
66 #include <linux/init.h>
7−#include <linux/bootmem.h>
87 #include <linux/memblock.h>
98 #include <linux/percpu.h>
109 #include <linux/kexec.h>
arch/x86/kernel/smpboot.c+1−1
@@ -49,7 +49,7 @@ · 48 unmodified lines
4949 #include <linux/sched/hotplug.h>
5050 #include <linux/sched/task_stack.h>
5151 #include <linux/percpu.h>
52−#include <linux/bootmem.h>
52+#include <linux/memblock.h>
5353 #include <linux/err.h>
5454 #include <linux/nmi.h>
5555 #include <linux/tboot.h>
arch/x86/kernel/tce_64.c+0−1
@@ -30,7 +30,6 @@ · 29 unmodified lines
3030 #include <linux/string.h>
3131 #include <linux/pci.h>
3232 #include <linux/dma-mapping.h>
33−#include <linux/bootmem.h>
3433 #include <linux/memblock.h>
3534 #include <asm/tce.h>
3635 #include <asm/calgary.h>
arch/x86/mm/amdtopology.c+0−1
@@ -12,7 +12,6 @@ · 11 unmodified lines
1212 #include <linux/string.h>
1313 #include <linux/nodemask.h>
1414 #include <linux/memblock.h>
15−#include <linux/bootmem.h>
1615
1716 #include <asm/io.h>
1817 #include <linux/pci_ids.h>
arch/x86/mm/fault.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #include <linux/sched/task_stack.h> /* task_stack_*(), ... */
99 #include <linux/kdebug.h> /* oops_begin/end, ... */
1010 #include <linux/extable.h> /* search_exception_tables */
11−#include <linux/bootmem.h> /* max_low_pfn */
11+#include <linux/memblock.h> /* max_low_pfn */
1212 #include <linux/kprobes.h> /* NOKPROBE_SYMBOL, ... */
1313 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
1414 #include <linux/perf_event.h> /* perf_sw_event */
arch/x86/mm/highmem_32.c+1−1
@@ -1,7 +1,7 @@
11 #include <linux/highmem.h>
22 #include <linux/export.h>
33 #include <linux/swap.h> /* for totalram_pages */
4−#include <linux/bootmem.h>
4+#include <linux/memblock.h>
55
66 void *kmap(struct page *page)
77 {
arch/x86/mm/init.c+0−1
@@ -3,7 +3,6 @@ · 2 unmodified lines
33 #include <linux/ioport.h>
44 #include <linux/swap.h>
55 #include <linux/memblock.h>
6−#include <linux/bootmem.h> /* for max_low_pfn */
76 #include <linux/swapfile.h>
87 #include <linux/swapops.h>
98
arch/x86/mm/init_32.c+0−1
@@ -23,7 +23,6 @@ · 22 unmodified lines
2323 #include <linux/pci.h>
2424 #include <linux/pfn.h>
2525 #include <linux/poison.h>
26−#include <linux/bootmem.h>
2726 #include <linux/memblock.h>
2827 #include <linux/proc_fs.h>
2928 #include <linux/memory_hotplug.h>
arch/x86/mm/init_64.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #include <linux/init.h>
2121 #include <linux/initrd.h>
2222 #include <linux/pagemap.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524 #include <linux/proc_fs.h>
2625 #include <linux/pci.h>
arch/x86/mm/ioremap.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * (C) Copyright 1995 1996 Linus Torvalds
77 */
88
9−#include <linux/bootmem.h>
9+#include <linux/memblock.h>
1010 #include <linux/init.h>
1111 #include <linux/io.h>
1212 #include <linux/ioport.h>
arch/x86/mm/kasan_init_64.c+1−2
@@ -5,10 +5,9 @@ · 4 unmodified lines
55 /* cpu_feature_enabled() cannot be used this early */
66 #define USE_EARLY_PGTABLE_L5
77
8−#include <linux/bootmem.h>
8+#include <linux/memblock.h>
99 #include <linux/kasan.h>
1010 #include <linux/kdebug.h>
11−#include <linux/memblock.h>
1211 #include <linux/mm.h>
1312 #include <linux/sched.h>
1413 #include <linux/sched/task.h>
arch/x86/mm/kaslr.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include <linux/kernel.h>
2424 #include <linux/init.h>
2525 #include <linux/random.h>
26+#include <linux/memblock.h>
2627
2728 #include <asm/pgalloc.h>
2829 #include <asm/pgtable.h>
arch/x86/mm/numa.c+0−1
@@ -4,7 +4,6 @@ · 3 unmodified lines
44 #include <linux/mm.h>
55 #include <linux/string.h>
66 #include <linux/init.h>
7−#include <linux/bootmem.h>
87 #include <linux/memblock.h>
98 #include <linux/mmzone.h>
109 #include <linux/ctype.h>
arch/x86/mm/numa_32.c+0−1
@@ -22,7 +22,6 @@ · 21 unmodified lines
2222 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2323 */
2424
25−#include <linux/bootmem.h>
2625 #include <linux/memblock.h>
2726 #include <linux/init.h>
2827
arch/x86/mm/numa_64.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 * Generic VM initialization for x86-64 NUMA setups.
44 * Copyright 2002,2003 Andi Kleen, SuSE Labs.
55 */
6−#include <linux/bootmem.h>
6+#include <linux/memblock.h>
77
88 #include "numa_internal.h"
99
arch/x86/mm/numa_emulation.c+0−1
@@ -6,7 +6,6 @@ · 5 unmodified lines
66 #include <linux/errno.h>
77 #include <linux/topology.h>
88 #include <linux/memblock.h>
9−#include <linux/bootmem.h>
109 #include <asm/dma.h>
1110
1211 #include "numa_internal.h"
arch/x86/mm/pageattr-test.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 * Clears the a test pte bit on random pages in the direct mapping,
66 * then reverts and compares page tables forwards and afterwards.
77 */
8−#include <linux/bootmem.h>
8+#include <linux/memblock.h>
99 #include <linux/kthread.h>
1010 #include <linux/random.h>
1111 #include <linux/kernel.h>
arch/x86/mm/pageattr.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 * Thanks to Ben LaHaise for precious feedback.
44 */
55 #include <linux/highmem.h>
6−#include <linux/bootmem.h>
6+#include <linux/memblock.h>
77 #include <linux/sched.h>
88 #include <linux/mm.h>
99 #include <linux/interrupt.h>
arch/x86/mm/pat.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 */
99
1010 #include <linux/seq_file.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/debugfs.h>
1313 #include <linux/ioport.h>
1414 #include <linux/kernel.h>
arch/x86/mm/physaddr.c+1−1
@@ -1,5 +1,5 @@
11 // SPDX-License-Identifier: GPL-2.0
2−#include <linux/bootmem.h>
2+#include <linux/memblock.h>
33 #include <linux/mmdebug.h>
44 #include <linux/export.h>
55 #include <linux/mm.h>
arch/x86/pci/i386.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <linux/init.h>
3333 #include <linux/ioport.h>
3434 #include <linux/errno.h>
35−#include <linux/bootmem.h>
35+#include <linux/memblock.h>
3636
3737 #include <asm/pat.h>
3838 #include <asm/e820/api.h>
arch/x86/platform/efi/efi.c+1−2
@@ -36,9 +36,8 @@ · 35 unmodified lines
3636 #include <linux/efi.h>
3737 #include <linux/efi-bgrt.h>
3838 #include <linux/export.h>
39−#include <linux/bootmem.h>
40−#include <linux/slab.h>
4139 #include <linux/memblock.h>
40+#include <linux/slab.h>
4241 #include <linux/spinlock.h>
4342 #include <linux/uaccess.h>
4443 #include <linux/time.h>
arch/x86/platform/efi/efi_64.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/mm.h>
2424 #include <linux/types.h>
2525 #include <linux/spinlock.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/ioport.h>
2828 #include <linux/mc146818rtc.h>
2929 #include <linux/efi.h>
arch/x86/platform/efi/quirks.c+0−1
@@ -8,7 +8,6 @@ · 7 unmodified lines
88 #include <linux/efi.h>
99 #include <linux/slab.h>
1010 #include <linux/memblock.h>
11−#include <linux/bootmem.h>
1211 #include <linux/acpi.h>
1312 #include <linux/dmi.h>
1413
arch/x86/platform/olpc/olpc_dt.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 */
1818
1919 #include <linux/kernel.h>
20−#include <linux/bootmem.h>
20+#include <linux/memblock.h>
2121 #include <linux/of.h>
2222 #include <linux/of_platform.h>
2323 #include <linux/of_pdt.h>
arch/x86/power/hibernate_32.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88
99 #include <linux/gfp.h>
1010 #include <linux/suspend.h>
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212
1313 #include <asm/page.h>
1414 #include <asm/pgtable.h>
arch/x86/xen/enlighten.c+1−1
@@ -1,7 +1,7 @@
11 // SPDX-License-Identifier: GPL-2.0
22
33 #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
4−#include <linux/bootmem.h>
4+#include <linux/memblock.h>
55 #endif
66 #include <linux/cpu.h>
77 #include <linux/kexec.h>
arch/x86/xen/enlighten_pv.c+1−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/start_kernel.h>
2424 #include <linux/sched.h>
2525 #include <linux/kprobes.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/export.h>
2828 #include <linux/mm.h>
2929 #include <linux/page-flags.h>
@@ -31,7 +31,6 @@ · 1 unmodified line
3131 #include <linux/console.h>
3232 #include <linux/pci.h>
3333 #include <linux/gfp.h>
34−#include <linux/memblock.h>
3534 #include <linux/edd.h>
3635 #include <linux/frame.h>
3736
arch/x86/xen/p2m.c+0−1
@@ -67,7 +67,6 @@ · 66 unmodified lines
6767 #include <linux/hash.h>
6868 #include <linux/sched.h>
6969 #include <linux/seq_file.h>
70−#include <linux/bootmem.h>
7170 #include <linux/memblock.h>
7271 #include <linux/slab.h>
7372 #include <linux/vmalloc.h>
arch/xtensa/kernel/pci.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <linux/init.h>
2525 #include <linux/sched.h>
2626 #include <linux/errno.h>
27−#include <linux/bootmem.h>
27+#include <linux/memblock.h>
2828
2929 #include <asm/pci-bridge.h>
3030 #include <asm/platform.h>
arch/xtensa/mm/cache.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/string.h>
2222 #include <linux/types.h>
2323 #include <linux/ptrace.h>
24−#include <linux/bootmem.h>
24+#include <linux/memblock.h>
2525 #include <linux/swap.h>
2626 #include <linux/pagemap.h>
2727
arch/xtensa/mm/init.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818
1919 #include <linux/kernel.h>
2020 #include <linux/errno.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222 #include <linux/gfp.h>
2323 #include <linux/highmem.h>
2424 #include <linux/swap.h>
arch/xtensa/mm/kasan_init.c+1−2
@@ -8,11 +8,10 @@ · 7 unmodified lines
88 * Copyright (C) 2017 Cadence Design Systems Inc.
99 */
1010
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/init_task.h>
1313 #include <linux/kasan.h>
1414 #include <linux/kernel.h>
15−#include <linux/memblock.h>
1615 #include <asm/initialize_mmu.h>
1716 #include <asm/tlbflush.h>
1817 #include <asm/traps.h>
arch/xtensa/mm/mmu.c+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 *
55 * Extracted from init.c
66 */
7−#include <linux/bootmem.h>
7+#include <linux/memblock.h>
88 #include <linux/percpu.h>
99 #include <linux/init.h>
1010 #include <linux/string.h>
arch/xtensa/platforms/iss/network.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 #include <linux/etherdevice.h>
3131 #include <linux/interrupt.h>
3232 #include <linux/ioctl.h>
33−#include <linux/bootmem.h>
33+#include <linux/memblock.h>
3434 #include <linux/ethtool.h>
3535 #include <linux/rtnetlink.h>
3636 #include <linux/platform_device.h>
arch/xtensa/platforms/iss/setup.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 * option) any later version.
1717 *
1818 */
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/stddef.h>
2121 #include <linux/kernel.h>
2222 #include <linux/init.h>
block/blk-settings.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 #include <linux/init.h>
77 #include <linux/bio.h>
88 #include <linux/blkdev.h>
9−#include <linux/bootmem.h> /* for max_pfn/max_low_pfn */
9+#include <linux/memblock.h> /* for max_pfn/max_low_pfn */
1010 #include <linux/gcd.h>
1111 #include <linux/lcm.h>
1212 #include <linux/jiffies.h>
block/bounce.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/init.h>
1919 #include <linux/hash.h>
2020 #include <linux/highmem.h>
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222 #include <linux/printk.h>
2323 #include <asm/tlbflush.h>
2424
drivers/acpi/numa.c+0−1
@@ -27,7 +27,6 @@ · 26 unmodified lines
2727 #include <linux/types.h>
2828 #include <linux/errno.h>
2929 #include <linux/acpi.h>
30−#include <linux/bootmem.h>
3130 #include <linux/memblock.h>
3231 #include <linux/numa.h>
3332 #include <linux/nodemask.h>
drivers/acpi/tables.c+1−2
@@ -31,9 +31,8 @@ · 30 unmodified lines
3131 #include <linux/irq.h>
3232 #include <linux/errno.h>
3333 #include <linux/acpi.h>
34−#include <linux/bootmem.h>
35−#include <linux/earlycpio.h>
3634 #include <linux/memblock.h>
35+#include <linux/earlycpio.h>
3736 #include <linux/initrd.h>
3837 #include "internal.h"
3938
drivers/base/platform.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/module.h>
1717 #include <linux/init.h>
1818 #include <linux/dma-mapping.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/err.h>
2121 #include <linux/slab.h>
2222 #include <linux/pm_runtime.h>
drivers/clk/ti/clk.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/of_address.h>
2424 #include <linux/list.h>
2525 #include <linux/regmap.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/device.h>
2828
2929 #include "clock.h"
drivers/firmware/dmi_scan.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 #include <linux/ctype.h>
66 #include <linux/dmi.h>
77 #include <linux/efi.h>
8−#include <linux/bootmem.h>
8+#include <linux/memblock.h>
99 #include <linux/random.h>
1010 #include <asm/dmi.h>
1111 #include <asm/unaligned.h>
drivers/firmware/efi/apple-properties.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020
2121 #define pr_fmt(fmt) "apple-properties: " fmt
2222
23−#include <linux/bootmem.h>
23+#include <linux/memblock.h>
2424 #include <linux/efi.h>
2525 #include <linux/io.h>
2626 #include <linux/platform_data/x86/apple.h>
drivers/firmware/iscsi_ibft_find.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 * GNU General Public License for more details.
1919 */
2020
21−#include <linux/bootmem.h>
21+#include <linux/memblock.h>
2222 #include <linux/blkdev.h>
2323 #include <linux/ctype.h>
2424 #include <linux/device.h>
drivers/firmware/memmap.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/kernel.h>
2020 #include <linux/module.h>
2121 #include <linux/types.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/slab.h>
2424 #include <linux/mm.h>
2525
drivers/iommu/mtk_iommu.c+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212 * GNU General Public License for more details.
1313 */
14−#include <linux/bootmem.h>
14+#include <linux/memblock.h>
1515 #include <linux/bug.h>
1616 #include <linux/clk.h>
1717 #include <linux/component.h>
drivers/iommu/mtk_iommu_v1.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414 * GNU General Public License for more details.
1515 */
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717 #include <linux/bug.h>
1818 #include <linux/clk.h>
1919 #include <linux/component.h>
drivers/macintosh/smu.c+1−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/kernel.h>
2424 #include <linux/device.h>
2525 #include <linux/dmapool.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/vmalloc.h>
2828 #include <linux/highmem.h>
2929 #include <linux/jiffies.h>
@@ -38,7 +38,6 @@ · 8 unmodified lines
3838 #include <linux/of_irq.h>
3939 #include <linux/of_platform.h>
4040 #include <linux/slab.h>
41−#include <linux/memblock.h>
4241 #include <linux/sched/signal.h>
4342
4443 #include <asm/byteorder.h>
drivers/mtd/ar7part.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525
2626 #include <linux/mtd/mtd.h>
2727 #include <linux/mtd/partitions.h>
28−#include <linux/bootmem.h>
28+#include <linux/memblock.h>
2929 #include <linux/module.h>
3030
3131 #include <uapi/linux/magic.h>
drivers/net/arcnet/arc-rimi.c+1−1
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333 #include <linux/ioport.h>
3434 #include <linux/delay.h>
3535 #include <linux/netdevice.h>
36−#include <linux/bootmem.h>
36+#include <linux/memblock.h>
3737 #include <linux/init.h>
3838 #include <linux/interrupt.h>
3939 #include <linux/io.h>
drivers/net/arcnet/com20020-isa.c+1−1
@@ -38,7 +38,7 @@ · 37 unmodified lines
3838 #include <linux/netdevice.h>
3939 #include <linux/init.h>
4040 #include <linux/interrupt.h>
41−#include <linux/bootmem.h>
41+#include <linux/memblock.h>
4242 #include <linux/io.h>
4343
4444 #include "arcdevice.h"
drivers/net/arcnet/com90io.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include <linux/ioport.h>
3535 #include <linux/delay.h>
3636 #include <linux/netdevice.h>
37−#include <linux/bootmem.h>
37+#include <linux/memblock.h>
3838 #include <linux/init.h>
3939 #include <linux/interrupt.h>
4040 #include <linux/io.h>
drivers/of/fdt.c+0−1
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #include <linux/crc32.h>
1212 #include <linux/kernel.h>
1313 #include <linux/initrd.h>
14−#include <linux/bootmem.h>
1514 #include <linux/memblock.h>
1615 #include <linux/mutex.h>
1716 #include <linux/of.h>
drivers/of/unittest.c+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55
66 #define pr_fmt(fmt) "### dt-test ### " fmt
77
8−#include <linux/bootmem.h>
8+#include <linux/memblock.h>
99 #include <linux/clk.h>
1010 #include <linux/err.h>
1111 #include <linux/errno.h>
drivers/s390/char/fs3270.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 * Copyright IBM Corp. 2003, 2009
99 */
1010
11−#include <linux/bootmem.h>
11+#include <linux/memblock.h>
1212 #include <linux/console.h>
1313 #include <linux/init.h>
1414 #include <linux/interrupt.h>
drivers/s390/char/tty3270.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/workqueue.h>
2020
2121 #include <linux/slab.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/compat.h>
2424
2525 #include <asm/ccwdev.h>
drivers/s390/cio/cmf.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #define KMSG_COMPONENT "cio"
1414 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
1515
16−#include <linux/bootmem.h>
16+#include <linux/memblock.h>
1717 #include <linux/device.h>
1818 #include <linux/init.h>
1919 #include <linux/list.h>
drivers/s390/virtio/virtio_ccw.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99
1010 #include <linux/kernel_stat.h>
1111 #include <linux/init.h>
12−#include <linux/bootmem.h>
12+#include <linux/memblock.h>
1313 #include <linux/err.h>
1414 #include <linux/virtio.h>
1515 #include <linux/virtio_config.h>
drivers/sfi/sfi_core.c+1−1
@@ -59,7 +59,7 @@ · 58 unmodified lines
5959 #define KMSG_COMPONENT "SFI"
6060 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
6161
62−#include <linux/bootmem.h>
62+#include <linux/memblock.h>
6363 #include <linux/kernel.h>
6464 #include <linux/module.h>
6565 #include <linux/errno.h>
drivers/tty/serial/cpm_uart/cpm_uart_core.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <linux/console.h>
2525 #include <linux/sysrq.h>
2626 #include <linux/device.h>
27−#include <linux/bootmem.h>
27+#include <linux/memblock.h>
2828 #include <linux/dma-mapping.h>
2929 #include <linux/fs_uart_pd.h>
3030 #include <linux/of_address.h>
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/console.h>
2020 #include <linux/sysrq.h>
2121 #include <linux/device.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/dma-mapping.h>
2424
2525 #include <asm/io.h>
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/console.h>
2020 #include <linux/sysrq.h>
2121 #include <linux/device.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323 #include <linux/dma-mapping.h>
2424
2525 #include <asm/io.h>
drivers/usb/early/xhci-dbc.c+0−1
@@ -12,7 +12,6 @@ · 11 unmodified lines
1212 #include <linux/console.h>
1313 #include <linux/pci_regs.h>
1414 #include <linux/pci_ids.h>
15−#include <linux/bootmem.h>
1615 #include <linux/memblock.h>
1716 #include <linux/io.h>
1817 #include <asm/pci-direct.h>
drivers/xen/balloon.c+1−1
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444 #include <linux/cred.h>
4545 #include <linux/errno.h>
4646 #include <linux/mm.h>
47−#include <linux/bootmem.h>
47+#include <linux/memblock.h>
4848 #include <linux/pagemap.h>
4949 #include <linux/highmem.h>
5050 #include <linux/mutex.h>
drivers/xen/events/events_base.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <linux/irq.h>
2929 #include <linux/moduleparam.h>
3030 #include <linux/string.h>
31−#include <linux/bootmem.h>
31+#include <linux/memblock.h>
3232 #include <linux/slab.h>
3333 #include <linux/irqnr.h>
3434 #include <linux/pci.h>
drivers/xen/grant-table.c+1−1
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333
3434 #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
3535
36−#include <linux/bootmem.h>
36+#include <linux/memblock.h>
3737 #include <linux/sched.h>
3838 #include <linux/mm.h>
3939 #include <linux/slab.h>
drivers/xen/swiotlb-xen.c+0−1
@@ -35,7 +35,6 @@ · 34 unmodified lines
3535
3636 #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
3737
38−#include <linux/bootmem.h>
3938 #include <linux/memblock.h>
4039 #include <linux/dma-direct.h>
4140 #include <linux/export.h>
drivers/xen/xen-selfballoon.c+1−1
@@ -68,7 +68,7 @@ · 67 unmodified lines
6868 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
6969
7070 #include <linux/kernel.h>
71−#include <linux/bootmem.h>
71+#include <linux/memblock.h>
7272 #include <linux/swap.h>
7373 #include <linux/mm.h>
7474 #include <linux/mman.h>
fs/dcache.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <linux/export.h>
2727 #include <linux/security.h>
2828 #include <linux/seqlock.h>
29−#include <linux/bootmem.h>
29+#include <linux/memblock.h>
3030 #include <linux/bit_spinlock.h>
3131 #include <linux/rculist_bl.h>
3232 #include <linux/list_lru.h>
fs/inode.c+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
1010 #include <linux/swap.h>
1111 #include <linux/security.h>
1212 #include <linux/cdev.h>
13−#include <linux/bootmem.h>
13+#include <linux/memblock.h>
1414 #include <linux/fsnotify.h>
1515 #include <linux/mount.h>
1616 #include <linux/posix_acl.h>
fs/namespace.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/uaccess.h>
2424 #include <linux/proc_ns.h>
2525 #include <linux/magic.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/task_work.h>
2828 #include <linux/sched/task.h>
2929
fs/proc/kcore.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <linux/vmalloc.h>
2323 #include <linux/highmem.h>
2424 #include <linux/printk.h>
25−#include <linux/bootmem.h>
25+#include <linux/memblock.h>
2626 #include <linux/init.h>
2727 #include <linux/slab.h>
2828 #include <linux/uaccess.h>
fs/proc/page.c+1−1
@@ -1,5 +1,5 @@
11 // SPDX-License-Identifier: GPL-2.0
2−#include <linux/bootmem.h>
2+#include <linux/memblock.h>
33 #include <linux/compiler.h>
44 #include <linux/fs.h>
55 #include <linux/init.h>
fs/proc/vmcore.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <linux/slab.h>
1717 #include <linux/highmem.h>
1818 #include <linux/printk.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/init.h>
2121 #include <linux/crash_dump.h>
2222 #include <linux/list.h>
include/linux/bootmem.h+0−173
@@ -1,173 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
2−/*
3− * Discontiguous memory support, Kanoj Sarcar, SGI, Nov 1999
4− */
5−#ifndef _LINUX_BOOTMEM_H
6−#define _LINUX_BOOTMEM_H
7−
8−#include <linux/mmzone.h>
9−#include <linux/mm_types.h>
10−#include <asm/dma.h>
11−#include <asm/processor.h>
12−
13−/*
14− * simple boot-time physical memory area allocator.
15− */
16−
17−extern unsigned long max_low_pfn;
18−extern unsigned long min_low_pfn;
19−
20−/*
21− * highest page
22− */
23−extern unsigned long max_pfn;
24−/*
25− * highest possible page
26− */
27−extern unsigned long long max_possible_pfn;
28−
29−extern unsigned long memblock_free_all(void);
30−extern void reset_node_managed_pages(pg_data_t *pgdat);
31−extern void reset_all_zones_managed_pages(void);
32−
33−/* We are using top down, so it is safe to use 0 here */
34−#define BOOTMEM_LOW_LIMIT 0
35−
36−#ifndef ARCH_LOW_ADDRESS_LIMIT
37−#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
38−#endif
39−
40−/* FIXME: use MEMBLOCK_ALLOC_* variants here */
41−#define BOOTMEM_ALLOC_ACCESSIBLE 0
42−#define BOOTMEM_ALLOC_ANYWHERE (~(phys_addr_t)0)
43−
44−/* FIXME: Move to memblock.h at a point where we remove nobootmem.c */
45−void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
46− phys_addr_t min_addr,
47− phys_addr_t max_addr, int nid);
48−void *memblock_alloc_try_nid_nopanic(phys_addr_t size,
49− phys_addr_t align, phys_addr_t min_addr,
50− phys_addr_t max_addr, int nid);
51−void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
52− phys_addr_t min_addr, phys_addr_t max_addr, int nid);
53−void __memblock_free_early(phys_addr_t base, phys_addr_t size);
54−void __memblock_free_late(phys_addr_t base, phys_addr_t size);
55−
56−static inline void * __init memblock_alloc(
57− phys_addr_t size, phys_addr_t align)
58−{
59− return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
60− BOOTMEM_ALLOC_ACCESSIBLE,
61− NUMA_NO_NODE);
62−}
63−
64−static inline void * __init memblock_alloc_raw(
65− phys_addr_t size, phys_addr_t align)
66−{
67− return memblock_alloc_try_nid_raw(size, align, BOOTMEM_LOW_LIMIT,
68− BOOTMEM_ALLOC_ACCESSIBLE,
69− NUMA_NO_NODE);
70−}
71−
72−static inline void * __init memblock_alloc_from(
73− phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
74−{
75− return memblock_alloc_try_nid(size, align, min_addr,
76− BOOTMEM_ALLOC_ACCESSIBLE,
77− NUMA_NO_NODE);
78−}
79−
80−static inline void * __init memblock_alloc_nopanic(
81− phys_addr_t size, phys_addr_t align)
82−{
83− return memblock_alloc_try_nid_nopanic(size, align,
84− BOOTMEM_LOW_LIMIT,
85− BOOTMEM_ALLOC_ACCESSIBLE,
86− NUMA_NO_NODE);
87−}
88−
89−static inline void * __init memblock_alloc_low(
90− phys_addr_t size, phys_addr_t align)
91−{
92− return memblock_alloc_try_nid(size, align,
93− BOOTMEM_LOW_LIMIT,
94− ARCH_LOW_ADDRESS_LIMIT,
95− NUMA_NO_NODE);
96−}
97−static inline void * __init memblock_alloc_low_nopanic(
98− phys_addr_t size, phys_addr_t align)
99−{
100− return memblock_alloc_try_nid_nopanic(size, align,
101− BOOTMEM_LOW_LIMIT,
102− ARCH_LOW_ADDRESS_LIMIT,
103− NUMA_NO_NODE);
104−}
105−
106−static inline void * __init memblock_alloc_from_nopanic(
107− phys_addr_t size, phys_addr_t align, phys_addr_t min_addr)
108−{
109− return memblock_alloc_try_nid_nopanic(size, align, min_addr,
110− BOOTMEM_ALLOC_ACCESSIBLE,
111− NUMA_NO_NODE);
112−}
113−
114−static inline void * __init memblock_alloc_node(
115− phys_addr_t size, phys_addr_t align, int nid)
116−{
117− return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT,
118− BOOTMEM_ALLOC_ACCESSIBLE, nid);
119−}
120−
121−static inline void * __init memblock_alloc_node_nopanic(
122− phys_addr_t size, int nid)
123−{
124− return memblock_alloc_try_nid_nopanic(size, 0, BOOTMEM_LOW_LIMIT,
125− BOOTMEM_ALLOC_ACCESSIBLE,
126− nid);
127−}
128−
129−static inline void __init memblock_free_early(
130− phys_addr_t base, phys_addr_t size)
131−{
132− __memblock_free_early(base, size);
133−}
134−
135−static inline void __init memblock_free_early_nid(
136− phys_addr_t base, phys_addr_t size, int nid)
137−{
138− __memblock_free_early(base, size);
139−}
140−
141−static inline void __init memblock_free_late(
142− phys_addr_t base, phys_addr_t size)
143−{
144− __memblock_free_late(base, size);
145−}
146−
147−extern void *alloc_large_system_hash(const char *tablename,
148− unsigned long bucketsize,
149− unsigned long numentries,
150− int scale,
151− int flags,
152− unsigned int *_hash_shift,
153− unsigned int *_hash_mask,
154− unsigned long low_limit,
155− unsigned long high_limit);
156−
157−#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
158−#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min
159− * shift passed via *_hash_shift */
160−#define HASH_ZERO 0x00000004 /* Zero allocated hash table */
161−
162−/* Only NUMA needs hash distribution. 64bit NUMA architectures have
163− * sufficient vmalloc space.
164− */
165−#ifdef CONFIG_NUMA
166−#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
167−extern int hashdist; /* Distribute hashes across NUMA nodes? */
168−#else
169−#define hashdist (0)
170−#endif
171−
172−
173−#endif /* _LINUX_BOOTMEM_H */
include/linux/memblock.h+147−4
@@ -15,6 +15,19 @@ · 14 unmodified lines
1515
1616 #include <linux/init.h>
1717 #include <linux/mm.h>
18+#include <asm/dma.h>
19+
20+extern unsigned long max_low_pfn;
21+extern unsigned long min_low_pfn;
22+
23+/*
24+ * highest page
25+ */
26+extern unsigned long max_pfn;
27+/*
28+ * highest possible page
29+ */
30+extern unsigned long long max_possible_pfn;
1831
1932 #define INIT_MEMBLOCK_REGIONS 128
2033 #define INIT_PHYSMEM_REGIONS 4
@@ -119,6 +132,10 @@ int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); · 98 unmodified lines
119132 int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);
120133 enum memblock_flags choose_memblock_flags(void);
121134
135+unsigned long memblock_free_all(void);
136+void reset_node_managed_pages(pg_data_t *pgdat);
137+void reset_all_zones_managed_pages(void);
138+
122139 /* Low level functions */
123140 int memblock_add_range(struct memblock_type *type,
124141 phys_addr_t base, phys_addr_t size,
@@ -300,11 +317,116 @@ static inline int memblock_get_region_node(const struct memblock_region *r) · 175 unmodified lines
300317 }
301318 #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
302319
320+/* Flags for memblock allocation APIs */
321+#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
322+#define MEMBLOCK_ALLOC_ACCESSIBLE 0
323+
324+/* We are using top down, so it is safe to use 0 here */
325+#define MEMBLOCK_LOW_LIMIT 0
326+
327+#ifndef ARCH_LOW_ADDRESS_LIMIT
328+#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
329+#endif
330+
303331 phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid);
304332 phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
305333
306334 phys_addr_t memblock_phys_alloc(phys_addr_t size, phys_addr_t align);
307335
336+void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
337+ phys_addr_t min_addr, phys_addr_t max_addr,
338+ int nid);
339+void *memblock_alloc_try_nid_nopanic(phys_addr_t size, phys_addr_t align,
340+ phys_addr_t min_addr, phys_addr_t max_addr,
341+ int nid);
342+void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
343+ phys_addr_t min_addr, phys_addr_t max_addr,
344+ int nid);
345+
346+static inline void * __init memblock_alloc(phys_addr_t size, phys_addr_t align)
347+{
348+ return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
349+ MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
350+}
351+
352+static inline void * __init memblock_alloc_raw(phys_addr_t size,
353+ phys_addr_t align)
354+{
355+ return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT,
356+ MEMBLOCK_ALLOC_ACCESSIBLE,
357+ NUMA_NO_NODE);
358+}
359+
360+static inline void * __init memblock_alloc_from(phys_addr_t size,
361+ phys_addr_t align,
362+ phys_addr_t min_addr)
363+{
364+ return memblock_alloc_try_nid(size, align, min_addr,
365+ MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
366+}
367+
368+static inline void * __init memblock_alloc_nopanic(phys_addr_t size,
369+ phys_addr_t align)
370+{
371+ return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT,
372+ MEMBLOCK_ALLOC_ACCESSIBLE,
373+ NUMA_NO_NODE);
374+}
375+
376+static inline void * __init memblock_alloc_low(phys_addr_t size,
377+ phys_addr_t align)
378+{
379+ return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
380+ ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE);
381+}
382+static inline void * __init memblock_alloc_low_nopanic(phys_addr_t size,
383+ phys_addr_t align)
384+{
385+ return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT,
386+ ARCH_LOW_ADDRESS_LIMIT,
387+ NUMA_NO_NODE);
388+}
389+
390+static inline void * __init memblock_alloc_from_nopanic(phys_addr_t size,
391+ phys_addr_t align,
392+ phys_addr_t min_addr)
393+{
394+ return memblock_alloc_try_nid_nopanic(size, align, min_addr,
395+ MEMBLOCK_ALLOC_ACCESSIBLE,
396+ NUMA_NO_NODE);
397+}
398+
399+static inline void * __init memblock_alloc_node(phys_addr_t size,
400+ phys_addr_t align, int nid)
401+{
402+ return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
403+ MEMBLOCK_ALLOC_ACCESSIBLE, nid);
404+}
405+
406+static inline void * __init memblock_alloc_node_nopanic(phys_addr_t size,
407+ int nid)
408+{
409+ return memblock_alloc_try_nid_nopanic(size, 0, MEMBLOCK_LOW_LIMIT,
410+ MEMBLOCK_ALLOC_ACCESSIBLE, nid);
411+}
412+
413+static inline void __init memblock_free_early(phys_addr_t base,
414+ phys_addr_t size)
415+{
416+ __memblock_free_early(base, size);
417+}
418+
419+static inline void __init memblock_free_early_nid(phys_addr_t base,
420+ phys_addr_t size, int nid)
421+{
422+ __memblock_free_early(base, size);
423+}
424+
425+static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
426+{
427+ __memblock_free_late(base, size);
428+}
429+
308430 /*
309431 * Set the allocation direction to bottom-up or top-down.
310432 */
@@ -323,10 +445,6 @@ static inline bool memblock_bottom_up(void) · 12 unmodified lines
323445 return memblock.bottom_up;
324446 }
325447
326−/* Flags for memblock_alloc_base() amd __memblock_alloc_base() */
327−#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
328−#define MEMBLOCK_ALLOC_ACCESSIBLE 0
329−
330448 phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
331449 phys_addr_t start, phys_addr_t end,
332450 enum memblock_flags flags);
@@ -432,6 +550,31 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo · 99 unmodified lines
432550 i < memblock_type->cnt; \
433551 i++, rgn = &memblock_type->regions[i])
434552
553+extern void *alloc_large_system_hash(const char *tablename,
554+ unsigned long bucketsize,
555+ unsigned long numentries,
556+ int scale,
557+ int flags,
558+ unsigned int *_hash_shift,
559+ unsigned int *_hash_mask,
560+ unsigned long low_limit,
561+ unsigned long high_limit);
562+
563+#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
564+#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min
565+ * shift passed via *_hash_shift */
566+#define HASH_ZERO 0x00000004 /* Zero allocated hash table */
567+
568+/* Only NUMA needs hash distribution. 64bit NUMA architectures have
569+ * sufficient vmalloc space.
570+ */
571+#ifdef CONFIG_NUMA
572+#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
573+extern int hashdist; /* Distribute hashes across NUMA nodes? */
574+#else
575+#define hashdist (0)
576+#endif
577+
435578 #ifdef CONFIG_MEMTEST
436579 extern void early_memtest(phys_addr_t start, phys_addr_t end);
437580 #else
init/main.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <linux/ioport.h>
2626 #include <linux/init.h>
2727 #include <linux/initrd.h>
28−#include <linux/bootmem.h>
28+#include <linux/memblock.h>
2929 #include <linux/acpi.h>
3030 #include <linux/console.h>
3131 #include <linux/nmi.h>
kernel/dma/direct.c+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 *
55 * DMA operations that map physical memory directly without using an IOMMU.
66 */
7−#include <linux/bootmem.h> /* for max_pfn */
7+#include <linux/memblock.h> /* for max_pfn */
88 #include <linux/export.h>
99 #include <linux/mm.h>
1010 #include <linux/dma-direct.h>
kernel/dma/swiotlb.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 #include <asm/dma.h>
4141
4242 #include <linux/init.h>
43−#include <linux/bootmem.h>
43+#include <linux/memblock.h>
4444 #include <linux/iommu-helper.h>
4545
4646 #define CREATE_TRACE_POINTS
kernel/futex.c+1−1
@@ -65,7 +65,7 @@ · 64 unmodified lines
6565 #include <linux/sched/mm.h>
6666 #include <linux/hugetlb.h>
6767 #include <linux/freezer.h>
68−#include <linux/bootmem.h>
68+#include <linux/memblock.h>
6969 #include <linux/fault-inject.h>
7070
7171 #include <asm/futex.h>
kernel/locking/qspinlock_paravirt.h+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 #endif
55
66 #include <linux/hash.h>
7−#include <linux/bootmem.h>
7+#include <linux/memblock.h>
88 #include <linux/debug_locks.h>
99
1010 /*
kernel/pid.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/slab.h>
3232 #include <linux/init.h>
3333 #include <linux/rculist.h>
34−#include <linux/bootmem.h>
34+#include <linux/memblock.h>
3535 #include <linux/hash.h>
3636 #include <linux/pid_namespace.h>
3737 #include <linux/init_task.h>
kernel/power/snapshot.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <linux/pm.h>
2424 #include <linux/device.h>
2525 #include <linux/init.h>
26−#include <linux/bootmem.h>
26+#include <linux/memblock.h>
2727 #include <linux/nmi.h>
2828 #include <linux/syscalls.h>
2929 #include <linux/console.h>
kernel/printk/printk.c+0−1
@@ -31,7 +31,6 @@ · 30 unmodified lines
3131 #include <linux/delay.h>
3232 #include <linux/smp.h>
3333 #include <linux/security.h>
34−#include <linux/bootmem.h>
3534 #include <linux/memblock.h>
3635 #include <linux/syscalls.h>
3736 #include <linux/crash_core.h>
kernel/profile.c+1−1
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616
1717 #include <linux/export.h>
1818 #include <linux/profile.h>
19−#include <linux/bootmem.h>
19+#include <linux/memblock.h>
2020 #include <linux/notifier.h>
2121 #include <linux/mm.h>
2222 #include <linux/cpumask.h>
lib/cpumask.c+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 #include <linux/bitops.h>
55 #include <linux/cpumask.h>
66 #include <linux/export.h>
7−#include <linux/bootmem.h>
7+#include <linux/memblock.h>
88
99 /**
1010 * cpumask_next - get the next cpu in a cpumask
mm/hugetlb.c+0−1
@@ -15,7 +15,6 @@ · 14 unmodified lines
1515 #include <linux/compiler.h>
1616 #include <linux/cpuset.h>
1717 #include <linux/mutex.h>
18−#include <linux/bootmem.h>
1918 #include <linux/memblock.h>
2019 #include <linux/sysfs.h>
2120 #include <linux/slab.h>
mm/kasan/kasan_init.c+1−2
@@ -10,11 +10,10 @@ · 9 unmodified lines
1010 *
1111 */
1212
13−#include <linux/bootmem.h>
13+#include <linux/memblock.h>
1414 #include <linux/init.h>
1515 #include <linux/kasan.h>
1616 #include <linux/kernel.h>
17−#include <linux/memblock.h>
1817 #include <linux/mm.h>
1918 #include <linux/pfn.h>
2019 #include <linux/slab.h>
mm/kmemleak.c+1−1
@@ -92,7 +92,7 @@ · 91 unmodified lines
9292 #include <linux/stacktrace.h>
9393 #include <linux/cache.h>
9494 #include <linux/percpu.h>
95−#include <linux/bootmem.h>
95+#include <linux/memblock.h>
9696 #include <linux/pfn.h>
9797 #include <linux/mmzone.h>
9898 #include <linux/slab.h>
mm/memblock.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #include <linux/kmemleak.h>
2121 #include <linux/seq_file.h>
2222 #include <linux/memblock.h>
23−#include <linux/bootmem.h>
2423
2524 #include <asm/sections.h>
2625 #include <linux/io.h>
mm/memory_hotplug.c+0−1
@@ -33,7 +33,6 @@ · 32 unmodified lines
3333 #include <linux/stop_machine.h>
3434 #include <linux/hugetlb.h>
3535 #include <linux/memblock.h>
36−#include <linux/bootmem.h>
3736 #include <linux/compaction.h>
3837
3938 #include <asm/tlbflush.h>
mm/page_alloc.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #include <linux/interrupt.h>
2121 #include <linux/pagemap.h>
2222 #include <linux/jiffies.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524 #include <linux/compiler.h>
2625 #include <linux/kernel.h>
mm/page_ext.c+1−1
@@ -1,7 +1,7 @@
11 // SPDX-License-Identifier: GPL-2.0
22 #include <linux/mm.h>
33 #include <linux/mmzone.h>
4−#include <linux/bootmem.h>
4+#include <linux/memblock.h>
55 #include <linux/page_ext.h>
66 #include <linux/memory.h>
77 #include <linux/vmalloc.h>
mm/page_idle.c+1−1
@@ -1,6 +1,6 @@
11 // SPDX-License-Identifier: GPL-2.0
22 #include <linux/init.h>
3−#include <linux/bootmem.h>
3+#include <linux/memblock.h>
44 #include <linux/fs.h>
55 #include <linux/sysfs.h>
66 #include <linux/kobject.h>
mm/page_owner.c+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 #include <linux/mm.h>
44 #include <linux/slab.h>
55 #include <linux/uaccess.h>
6−#include <linux/bootmem.h>
6+#include <linux/memblock.h>
77 #include <linux/stacktrace.h>
88 #include <linux/page_owner.h>
99 #include <linux/jump_label.h>
mm/percpu.c+1−1
@@ -65,7 +65,7 @@ · 64 unmodified lines
6565 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
6666
6767 #include <linux/bitmap.h>
68−#include <linux/bootmem.h>
68+#include <linux/memblock.h>
6969 #include <linux/err.h>
7070 #include <linux/lcm.h>
7171 #include <linux/list.h>
mm/sparse-vmemmap.c+0−1
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 */
2121 #include <linux/mm.h>
2222 #include <linux/mmzone.h>
23−#include <linux/bootmem.h>
2423 #include <linux/memblock.h>
2524 #include <linux/memremap.h>
2625 #include <linux/highmem.h>
mm/sparse.c+0−1
@@ -5,7 +5,6 @@ · 4 unmodified lines
55 #include <linux/mm.h>
66 #include <linux/slab.h>
77 #include <linux/mmzone.h>
8−#include <linux/bootmem.h>
98 #include <linux/memblock.h>
109 #include <linux/compiler.h>
1110 #include <linux/highmem.h>
net/ipv4/inet_hashtables.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/slab.h>
2020 #include <linux/wait.h>
2121 #include <linux/vmalloc.h>
22−#include <linux/bootmem.h>
22+#include <linux/memblock.h>
2323
2424 #include <net/addrconf.h>
2525 #include <net/inet_connection_sock.h>
net/ipv4/tcp.c+1−1
@@ -262,7 +262,7 @@ · 261 unmodified lines
262262 #include <linux/net.h>
263263 #include <linux/socket.h>
264264 #include <linux/random.h>
265−#include <linux/bootmem.h>
265+#include <linux/memblock.h>
266266 #include <linux/highmem.h>
267267 #include <linux/swap.h>
268268 #include <linux/cache.h>
net/ipv4/udp.c+1−1
@@ -81,7 +81,7 @@ · 80 unmodified lines
8181
8282 #include <linux/uaccess.h>
8383 #include <asm/ioctls.h>
84−#include <linux/bootmem.h>
84+#include <linux/memblock.h>
8585 #include <linux/highmem.h>
8686 #include <linux/swap.h>
8787 #include <linux/types.h>
net/sctp/protocol.c+1−1
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646 #include <linux/netdevice.h>
4747 #include <linux/inetdevice.h>
4848 #include <linux/seq_file.h>
49−#include <linux/bootmem.h>
49+#include <linux/memblock.h>
5050 #include <linux/highmem.h>
5151 #include <linux/swap.h>
5252 #include <linux/slab.h>
net/xfrm/xfrm_hash.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66
77 #include <linux/kernel.h>
88 #include <linux/mm.h>
9−#include <linux/bootmem.h>
9+#include <linux/memblock.h>
1010 #include <linux/vmalloc.h>
1111 #include <linux/slab.h>
1212 #include <linux/xfrm.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t