tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Mike Rapoport
and committed by
Linus Torvalds
57c8a661
97ad1087
+353
-476
+1
-1
arch/alpha/kernel/core_cia.c
+1
-1
arch/alpha/kernel/core_cia.c
-1
arch/alpha/kernel/core_irongate.c
-1
arch/alpha/kernel/core_irongate.c
+1
-1
arch/alpha/kernel/core_marvel.c
+1
-1
arch/alpha/kernel/core_marvel.c
+1
-1
arch/alpha/kernel/core_titan.c
+1
-1
arch/alpha/kernel/core_titan.c
+1
-1
arch/alpha/kernel/core_tsunami.c
+1
-1
arch/alpha/kernel/core_tsunami.c
+1
-1
arch/alpha/kernel/pci-noop.c
+1
-1
arch/alpha/kernel/pci-noop.c
+1
-1
arch/alpha/kernel/pci.c
+1
-1
arch/alpha/kernel/pci.c
+1
-1
arch/alpha/kernel/pci_iommu.c
+1
-1
arch/alpha/kernel/pci_iommu.c
-1
arch/alpha/kernel/setup.c
-1
arch/alpha/kernel/setup.c
+1
-1
arch/alpha/kernel/sys_nautilus.c
+1
-1
arch/alpha/kernel/sys_nautilus.c
+1
-1
arch/alpha/mm/init.c
+1
-1
arch/alpha/mm/init.c
-1
arch/alpha/mm/numa.c
-1
arch/alpha/mm/numa.c
+1
-1
arch/arc/kernel/unwind.c
+1
-1
arch/arc/kernel/unwind.c
+1
-1
arch/arc/mm/highmem.c
+1
-1
arch/arc/mm/highmem.c
-1
arch/arc/mm/init.c
-1
arch/arc/mm/init.c
-1
arch/arm/kernel/devtree.c
-1
arch/arm/kernel/devtree.c
-1
arch/arm/kernel/setup.c
-1
arch/arm/kernel/setup.c
+1
-1
arch/arm/mach-omap2/omap_hwmod.c
+1
-1
arch/arm/mach-omap2/omap_hwmod.c
-1
arch/arm/mm/dma-mapping.c
-1
arch/arm/mm/dma-mapping.c
-1
arch/arm/mm/init.c
-1
arch/arm/mm/init.c
-1
arch/arm/xen/mm.c
-1
arch/arm/xen/mm.c
+1
-1
arch/arm/xen/p2m.c
+1
-1
arch/arm/xen/p2m.c
-1
arch/arm64/kernel/acpi.c
-1
arch/arm64/kernel/acpi.c
-1
arch/arm64/kernel/acpi_numa.c
-1
arch/arm64/kernel/acpi_numa.c
-1
arch/arm64/kernel/setup.c
-1
arch/arm64/kernel/setup.c
+1
-1
arch/arm64/mm/dma-mapping.c
+1
-1
arch/arm64/mm/dma-mapping.c
-1
arch/arm64/mm/init.c
-1
arch/arm64/mm/init.c
-1
arch/arm64/mm/kasan_init.c
-1
arch/arm64/mm/kasan_init.c
-1
arch/arm64/mm/numa.c
-1
arch/arm64/mm/numa.c
-1
arch/c6x/kernel/setup.c
-1
arch/c6x/kernel/setup.c
+1
-1
arch/c6x/mm/init.c
+1
-1
arch/c6x/mm/init.c
-1
arch/h8300/kernel/setup.c
-1
arch/h8300/kernel/setup.c
+1
-1
arch/h8300/mm/init.c
+1
-1
arch/h8300/mm/init.c
+1
-1
arch/hexagon/kernel/dma.c
+1
-1
arch/hexagon/kernel/dma.c
+1
-1
arch/hexagon/kernel/setup.c
+1
-1
arch/hexagon/kernel/setup.c
-1
arch/hexagon/mm/init.c
-1
arch/hexagon/mm/init.c
+1
-1
arch/ia64/kernel/crash.c
+1
-1
arch/ia64/kernel/crash.c
+1
-1
arch/ia64/kernel/efi.c
+1
-1
arch/ia64/kernel/efi.c
+1
-1
arch/ia64/kernel/ia64_ksyms.c
+1
-1
arch/ia64/kernel/ia64_ksyms.c
···
6
6
#ifdef CONFIG_VIRTUAL_MEM_MAP
7
7
#include <linux/compiler.h>
8
8
#include <linux/export.h>
9
-
#include <linux/bootmem.h>
9
+
#include <linux/memblock.h>
10
10
EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not exported by generic code */
11
11
EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic code */
12
12
#endif
+1
-1
arch/ia64/kernel/iosapic.c
+1
-1
arch/ia64/kernel/iosapic.c
+1
-1
arch/ia64/kernel/mca.c
+1
-1
arch/ia64/kernel/mca.c
+1
-1
arch/ia64/kernel/mca_drv.c
+1
-1
arch/ia64/kernel/mca_drv.c
-1
arch/ia64/kernel/setup.c
-1
arch/ia64/kernel/setup.c
+1
-1
arch/ia64/kernel/smpboot.c
+1
-1
arch/ia64/kernel/smpboot.c
+1
-1
arch/ia64/kernel/topology.c
+1
-1
arch/ia64/kernel/topology.c
+1
-1
arch/ia64/kernel/unwind.c
+1
-1
arch/ia64/kernel/unwind.c
-1
arch/ia64/mm/contig.c
-1
arch/ia64/mm/contig.c
-1
arch/ia64/mm/discontig.c
-1
arch/ia64/mm/discontig.c
-1
arch/ia64/mm/init.c
-1
arch/ia64/mm/init.c
+1
-1
arch/ia64/mm/numa.c
+1
-1
arch/ia64/mm/numa.c
+1
-1
arch/ia64/mm/tlb.c
+1
-1
arch/ia64/mm/tlb.c
+1
-1
arch/ia64/pci/pci.c
+1
-1
arch/ia64/pci/pci.c
+1
-1
arch/ia64/sn/kernel/bte.c
+1
-1
arch/ia64/sn/kernel/bte.c
+1
-1
arch/ia64/sn/kernel/io_common.c
+1
-1
arch/ia64/sn/kernel/io_common.c
+1
-1
arch/ia64/sn/kernel/setup.c
+1
-1
arch/ia64/sn/kernel/setup.c
+1
-1
arch/m68k/atari/stram.c
+1
-1
arch/m68k/atari/stram.c
+1
-1
arch/m68k/coldfire/m54xx.c
+1
-1
arch/m68k/coldfire/m54xx.c
-1
arch/m68k/kernel/setup_mm.c
-1
arch/m68k/kernel/setup_mm.c
-1
arch/m68k/kernel/setup_no.c
-1
arch/m68k/kernel/setup_no.c
+1
-1
arch/m68k/kernel/uboot.c
+1
-1
arch/m68k/kernel/uboot.c
+1
-1
arch/m68k/mm/init.c
+1
-1
arch/m68k/mm/init.c
-1
arch/m68k/mm/mcfmmu.c
-1
arch/m68k/mm/mcfmmu.c
-1
arch/m68k/mm/motorola.c
-1
arch/m68k/mm/motorola.c
+1
-1
arch/m68k/mm/sun3mmu.c
+1
-1
arch/m68k/mm/sun3mmu.c
+1
-1
arch/m68k/sun3/config.c
+1
-1
arch/m68k/sun3/config.c
+1
-1
arch/m68k/sun3/dvma.c
+1
-1
arch/m68k/sun3/dvma.c
+1
-1
arch/m68k/sun3/mmu_emu.c
+1
-1
arch/m68k/sun3/mmu_emu.c
+1
-1
arch/m68k/sun3/sun3dvma.c
+1
-1
arch/m68k/sun3/sun3dvma.c
+1
-1
arch/m68k/sun3x/dvma.c
+1
-1
arch/m68k/sun3x/dvma.c
+1
-1
arch/microblaze/mm/consistent.c
+1
-1
arch/microblaze/mm/consistent.c
+1
-2
arch/microblaze/mm/init.c
+1
-2
arch/microblaze/mm/init.c
···
7
7
* for more details.
8
8
*/
9
9
10
-
#include <linux/bootmem.h>
10
+
#include <linux/memblock.h>
11
11
#include <linux/init.h>
12
12
#include <linux/kernel.h>
13
-
#include <linux/memblock.h>
14
13
#include <linux/mm.h> /* mem_init */
15
14
#include <linux/initrd.h>
16
15
#include <linux/pagemap.h>
+1
-1
arch/microblaze/pci/pci-common.c
+1
-1
arch/microblaze/pci/pci-common.c
+1
-1
arch/mips/ar7/memory.c
+1
-1
arch/mips/ar7/memory.c
···
16
16
* along with this program; if not, write to the Free Software
17
17
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18
18
*/
19
-
#include <linux/bootmem.h>
19
+
#include <linux/memblock.h>
20
20
#include <linux/init.h>
21
21
#include <linux/mm.h>
22
22
#include <linux/pfn.h>
+1
-1
arch/mips/ath79/setup.c
+1
-1
arch/mips/ath79/setup.c
+1
-1
arch/mips/bcm63xx/prom.c
+1
-1
arch/mips/bcm63xx/prom.c
+1
-1
arch/mips/bcm63xx/setup.c
+1
-1
arch/mips/bcm63xx/setup.c
+1
-1
arch/mips/bmips/setup.c
+1
-1
arch/mips/bmips/setup.c
+1
-1
arch/mips/cavium-octeon/dma-octeon.c
+1
-1
arch/mips/cavium-octeon/dma-octeon.c
+1
-1
arch/mips/dec/prom/memory.c
+1
-1
arch/mips/dec/prom/memory.c
+1
-1
arch/mips/emma/common/prom.c
+1
-1
arch/mips/emma/common/prom.c
+1
-1
arch/mips/fw/arc/memory.c
+1
-1
arch/mips/fw/arc/memory.c
+1
-1
arch/mips/jazz/jazzdma.c
+1
-1
arch/mips/jazz/jazzdma.c
+1
-1
arch/mips/kernel/crash.c
+1
-1
arch/mips/kernel/crash.c
+1
-1
arch/mips/kernel/crash_dump.c
+1
-1
arch/mips/kernel/crash_dump.c
+1
-1
arch/mips/kernel/prom.c
+1
-1
arch/mips/kernel/prom.c
-1
arch/mips/kernel/setup.c
-1
arch/mips/kernel/setup.c
-1
arch/mips/kernel/traps.c
-1
arch/mips/kernel/traps.c
+1
-1
arch/mips/kernel/vpe.c
+1
-1
arch/mips/kernel/vpe.c
+1
-1
arch/mips/kvm/commpage.c
+1
-1
arch/mips/kvm/commpage.c
+1
-1
arch/mips/kvm/dyntrans.c
+1
-1
arch/mips/kvm/dyntrans.c
+1
-1
arch/mips/kvm/emulate.c
+1
-1
arch/mips/kvm/emulate.c
+1
-1
arch/mips/kvm/interrupt.c
+1
-1
arch/mips/kvm/interrupt.c
+1
-1
arch/mips/kvm/mips.c
+1
-1
arch/mips/kvm/mips.c
+1
-1
arch/mips/lantiq/prom.c
+1
-1
arch/mips/lantiq/prom.c
+1
-1
arch/mips/lasat/prom.c
+1
-1
arch/mips/lasat/prom.c
+1
-1
arch/mips/loongson64/common/init.c
+1
-1
arch/mips/loongson64/common/init.c
-1
arch/mips/loongson64/loongson-3/numa.c
-1
arch/mips/loongson64/loongson-3/numa.c
+1
-1
arch/mips/mm/init.c
+1
-1
arch/mips/mm/init.c
+1
-1
arch/mips/mm/pgtable-32.c
+1
-1
arch/mips/mm/pgtable-32.c
+1
-1
arch/mips/mti-malta/malta-memory.c
+1
-1
arch/mips/mti-malta/malta-memory.c
+1
-1
arch/mips/netlogic/xlp/dt.c
+1
-1
arch/mips/netlogic/xlp/dt.c
+1
-1
arch/mips/pci/pci-legacy.c
+1
-1
arch/mips/pci/pci-legacy.c
+1
-1
arch/mips/pci/pci.c
+1
-1
arch/mips/pci/pci.c
+1
-1
arch/mips/ralink/of.c
+1
-1
arch/mips/ralink/of.c
+1
-1
arch/mips/rb532/prom.c
+1
-1
arch/mips/rb532/prom.c
-1
arch/mips/sgi-ip27/ip27-memory.c
-1
arch/mips/sgi-ip27/ip27-memory.c
+1
-1
arch/mips/sibyte/common/cfe.c
+1
-1
arch/mips/sibyte/common/cfe.c
+1
-1
arch/mips/sibyte/swarm/setup.c
+1
-1
arch/mips/sibyte/swarm/setup.c
+1
-1
arch/mips/txx9/rbtx4938/prom.c
+1
-1
arch/mips/txx9/rbtx4938/prom.c
+1
-2
arch/nds32/kernel/setup.c
+1
-2
arch/nds32/kernel/setup.c
···
2
2
// Copyright (C) 2005-2017 Andes Technology Corporation
3
3
4
4
#include <linux/cpu.h>
5
-
#include <linux/bootmem.h>
6
-
#include <linux/seq_file.h>
7
5
#include <linux/memblock.h>
6
+
#include <linux/seq_file.h>
8
7
#include <linux/console.h>
9
8
#include <linux/screen_info.h>
10
9
#include <linux/delay.h>
+1
-1
arch/nds32/mm/highmem.c
+1
-1
arch/nds32/mm/highmem.c
+1
-2
arch/nds32/mm/init.c
+1
-2
arch/nds32/mm/init.c
···
7
7
#include <linux/errno.h>
8
8
#include <linux/swap.h>
9
9
#include <linux/init.h>
10
-
#include <linux/bootmem.h>
10
+
#include <linux/memblock.h>
11
11
#include <linux/mman.h>
12
12
#include <linux/nodemask.h>
13
13
#include <linux/initrd.h>
14
14
#include <linux/highmem.h>
15
-
#include <linux/memblock.h>
16
15
17
16
#include <asm/sections.h>
18
17
#include <asm/setup.h>
+1
-1
arch/nios2/kernel/prom.c
+1
-1
arch/nios2/kernel/prom.c
-1
arch/nios2/kernel/setup.c
-1
arch/nios2/kernel/setup.c
+1
-1
arch/nios2/mm/init.c
+1
-1
arch/nios2/mm/init.c
+1
-2
arch/openrisc/kernel/setup.c
+1
-2
arch/openrisc/kernel/setup.c
···
30
30
#include <linux/delay.h>
31
31
#include <linux/console.h>
32
32
#include <linux/init.h>
33
-
#include <linux/bootmem.h>
33
+
#include <linux/memblock.h>
34
34
#include <linux/seq_file.h>
35
35
#include <linux/serial.h>
36
36
#include <linux/initrd.h>
37
37
#include <linux/of_fdt.h>
38
38
#include <linux/of.h>
39
-
#include <linux/memblock.h>
40
39
#include <linux/device.h>
41
40
42
41
#include <asm/sections.h>
+1
-2
arch/openrisc/mm/init.c
+1
-2
arch/openrisc/mm/init.c
···
26
26
#include <linux/mm.h>
27
27
#include <linux/swap.h>
28
28
#include <linux/smp.h>
29
-
#include <linux/bootmem.h>
29
+
#include <linux/memblock.h>
30
30
#include <linux/init.h>
31
31
#include <linux/delay.h>
32
32
#include <linux/blkdev.h> /* for initrd_* */
33
33
#include <linux/pagemap.h>
34
-
#include <linux/memblock.h>
35
34
36
35
#include <asm/segment.h>
37
36
#include <asm/pgalloc.h>
-1
arch/parisc/mm/init.c
-1
arch/parisc/mm/init.c
+1
-1
arch/powerpc/kernel/pci_32.c
+1
-1
arch/powerpc/kernel/pci_32.c
-1
arch/powerpc/kernel/setup-common.c
-1
arch/powerpc/kernel/setup-common.c
+1
-2
arch/powerpc/kernel/setup_64.c
+1
-2
arch/powerpc/kernel/setup_64.c
···
29
29
#include <linux/unistd.h>
30
30
#include <linux/serial.h>
31
31
#include <linux/serial_8250.h>
32
-
#include <linux/bootmem.h>
32
+
#include <linux/memblock.h>
33
33
#include <linux/pci.h>
34
34
#include <linux/lockdep.h>
35
-
#include <linux/memblock.h>
36
35
#include <linux/memory.h>
37
36
#include <linux/nmi.h>
38
37
+1
-1
arch/powerpc/lib/alloc.c
+1
-1
arch/powerpc/lib/alloc.c
-1
arch/powerpc/mm/hugetlbpage.c
-1
arch/powerpc/mm/hugetlbpage.c
+1
-2
arch/powerpc/mm/mem.c
+1
-2
arch/powerpc/mm/mem.c
···
27
27
#include <linux/mm.h>
28
28
#include <linux/stddef.h>
29
29
#include <linux/init.h>
30
-
#include <linux/bootmem.h>
30
+
#include <linux/memblock.h>
31
31
#include <linux/highmem.h>
32
32
#include <linux/initrd.h>
33
33
#include <linux/pagemap.h>
34
34
#include <linux/suspend.h>
35
-
#include <linux/memblock.h>
36
35
#include <linux/hugetlb.h>
37
36
#include <linux/slab.h>
38
37
#include <linux/vmalloc.h>
+1
-1
arch/powerpc/mm/mmu_context_nohash.c
+1
-1
arch/powerpc/mm/mmu_context_nohash.c
+1
-2
arch/powerpc/mm/numa.c
+1
-2
arch/powerpc/mm/numa.c
···
11
11
#define pr_fmt(fmt) "numa: " fmt
12
12
13
13
#include <linux/threads.h>
14
-
#include <linux/bootmem.h>
14
+
#include <linux/memblock.h>
15
15
#include <linux/init.h>
16
16
#include <linux/mm.h>
17
17
#include <linux/mmzone.h>
···
19
19
#include <linux/nodemask.h>
20
20
#include <linux/cpu.h>
21
21
#include <linux/notifier.h>
22
-
#include <linux/memblock.h>
23
22
#include <linux/of.h>
24
23
#include <linux/pfn.h>
25
24
#include <linux/cpuset.h>
+1
-1
arch/powerpc/platforms/powermac/nvram.c
+1
-1
arch/powerpc/platforms/powermac/nvram.c
+1
-2
arch/powerpc/platforms/powernv/pci-ioda.c
+1
-2
arch/powerpc/platforms/powernv/pci-ioda.c
···
17
17
#include <linux/delay.h>
18
18
#include <linux/string.h>
19
19
#include <linux/init.h>
20
-
#include <linux/bootmem.h>
20
+
#include <linux/memblock.h>
21
21
#include <linux/irq.h>
22
22
#include <linux/io.h>
23
23
#include <linux/msi.h>
24
-
#include <linux/memblock.h>
25
24
#include <linux/iommu.h>
26
25
#include <linux/rculist.h>
27
26
#include <linux/sizes.h>
+1
-1
arch/powerpc/platforms/ps3/setup.c
+1
-1
arch/powerpc/platforms/ps3/setup.c
+1
-1
arch/powerpc/sysdev/msi_bitmap.c
+1
-1
arch/powerpc/sysdev/msi_bitmap.c
+1
-2
arch/riscv/mm/init.c
+1
-2
arch/riscv/mm/init.c
+1
-2
arch/s390/kernel/crash_dump.c
+1
-2
arch/s390/kernel/crash_dump.c
···
13
13
#include <linux/mm.h>
14
14
#include <linux/gfp.h>
15
15
#include <linux/slab.h>
16
-
#include <linux/bootmem.h>
16
+
#include <linux/memblock.h>
17
17
#include <linux/elf.h>
18
18
#include <asm/asm-offsets.h>
19
-
#include <linux/memblock.h>
20
19
#include <asm/os_info.h>
21
20
#include <asm/elf.h>
22
21
#include <asm/ipl.h>
-1
arch/s390/kernel/setup.c
-1
arch/s390/kernel/setup.c
+1
-2
arch/s390/kernel/smp.c
+1
-2
arch/s390/kernel/smp.c
···
20
20
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
21
21
22
22
#include <linux/workqueue.h>
23
-
#include <linux/bootmem.h>
23
+
#include <linux/memblock.h>
24
24
#include <linux/export.h>
25
25
#include <linux/init.h>
26
26
#include <linux/mm.h>
···
35
35
#include <linux/sched/hotplug.h>
36
36
#include <linux/sched/task_stack.h>
37
37
#include <linux/crash_dump.h>
38
-
#include <linux/memblock.h>
39
38
#include <linux/kprobes.h>
40
39
#include <asm/asm-offsets.h>
41
40
#include <asm/diag.h>
+1
-1
arch/s390/kernel/topology.c
+1
-1
arch/s390/kernel/topology.c
+1
-1
arch/s390/kernel/vdso.c
+1
-1
arch/s390/kernel/vdso.c
+1
-1
arch/s390/mm/extmem.c
+1
-1
arch/s390/mm/extmem.c
+1
-2
arch/s390/mm/init.c
+1
-2
arch/s390/mm/init.c
···
21
21
#include <linux/smp.h>
22
22
#include <linux/init.h>
23
23
#include <linux/pagemap.h>
24
-
#include <linux/bootmem.h>
24
+
#include <linux/memblock.h>
25
25
#include <linux/memory.h>
26
26
#include <linux/pfn.h>
27
27
#include <linux/poison.h>
···
29
29
#include <linux/export.h>
30
30
#include <linux/cma.h>
31
31
#include <linux/gfp.h>
32
-
#include <linux/memblock.h>
33
32
#include <asm/processor.h>
34
33
#include <linux/uaccess.h>
35
34
#include <asm/pgtable.h>
+1
-2
arch/s390/mm/vmem.c
+1
-2
arch/s390/mm/vmem.c
···
4
4
* Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
5
5
*/
6
6
7
-
#include <linux/bootmem.h>
7
+
#include <linux/memblock.h>
8
8
#include <linux/pfn.h>
9
9
#include <linux/mm.h>
10
10
#include <linux/init.h>
11
11
#include <linux/list.h>
12
12
#include <linux/hugetlb.h>
13
13
#include <linux/slab.h>
14
-
#include <linux/memblock.h>
15
14
#include <asm/cacheflush.h>
16
15
#include <asm/pgalloc.h>
17
16
#include <asm/pgtable.h>
-1
arch/s390/numa/mode_emu.c
-1
arch/s390/numa/mode_emu.c
-1
arch/s390/numa/numa.c
-1
arch/s390/numa/numa.c
+1
-1
arch/s390/numa/toptree.c
+1
-1
arch/s390/numa/toptree.c
+1
-2
arch/sh/mm/init.c
+1
-2
arch/sh/mm/init.c
···
11
11
#include <linux/swap.h>
12
12
#include <linux/init.h>
13
13
#include <linux/gfp.h>
14
-
#include <linux/bootmem.h>
14
+
#include <linux/memblock.h>
15
15
#include <linux/proc_fs.h>
16
16
#include <linux/pagemap.h>
17
17
#include <linux/percpu.h>
18
18
#include <linux/io.h>
19
-
#include <linux/memblock.h>
20
19
#include <linux/dma-mapping.h>
21
20
#include <linux/export.h>
22
21
#include <asm/mmu_context.h>
+1
-1
arch/sh/mm/ioremap_fixed.c
+1
-1
arch/sh/mm/ioremap_fixed.c
-2
arch/sparc/kernel/mdesc.c
-2
arch/sparc/kernel/mdesc.c
···
5
5
*/
6
6
#include <linux/kernel.h>
7
7
#include <linux/types.h>
8
-
#include <linux/memblock.h>
9
8
#include <linux/log2.h>
10
9
#include <linux/list.h>
11
10
#include <linux/slab.h>
12
11
#include <linux/mm.h>
13
12
#include <linux/miscdevice.h>
14
-
#include <linux/bootmem.h>
15
13
#include <linux/memblock.h>
16
14
#include <linux/export.h>
17
15
#include <linux/refcount.h>
+1
-1
arch/sparc/kernel/prom_32.c
+1
-1
arch/sparc/kernel/prom_32.c
+1
-1
arch/sparc/kernel/setup_64.c
+1
-1
arch/sparc/kernel/setup_64.c
+1
-1
arch/sparc/kernel/smp_64.c
+1
-1
arch/sparc/kernel/smp_64.c
-1
arch/sparc/mm/init_32.c
-1
arch/sparc/mm/init_32.c
+1
-2
arch/sparc/mm/init_64.c
+1
-2
arch/sparc/mm/init_64.c
···
11
11
#include <linux/sched.h>
12
12
#include <linux/string.h>
13
13
#include <linux/init.h>
14
-
#include <linux/bootmem.h>
14
+
#include <linux/memblock.h>
15
15
#include <linux/mm.h>
16
16
#include <linux/hugetlb.h>
17
17
#include <linux/initrd.h>
···
25
25
#include <linux/sort.h>
26
26
#include <linux/ioport.h>
27
27
#include <linux/percpu.h>
28
-
#include <linux/memblock.h>
29
28
#include <linux/mmzone.h>
30
29
#include <linux/gfp.h>
31
30
+1
-1
arch/sparc/mm/srmmu.c
+1
-1
arch/sparc/mm/srmmu.c
+1
-1
arch/um/drivers/net_kern.c
+1
-1
arch/um/drivers/net_kern.c
+1
-1
arch/um/drivers/vector_kern.c
+1
-1
arch/um/drivers/vector_kern.c
+1
-1
arch/um/kernel/initrd.c
+1
-1
arch/um/kernel/initrd.c
-1
arch/um/kernel/mem.c
-1
arch/um/kernel/mem.c
-1
arch/um/kernel/physmem.c
-1
arch/um/kernel/physmem.c
+1
-1
arch/unicore32/kernel/hibernate.c
+1
-1
arch/unicore32/kernel/hibernate.c
+1
-2
arch/unicore32/kernel/setup.c
+1
-2
arch/unicore32/kernel/setup.c
···
17
17
#include <linux/utsname.h>
18
18
#include <linux/initrd.h>
19
19
#include <linux/console.h>
20
-
#include <linux/bootmem.h>
20
+
#include <linux/memblock.h>
21
21
#include <linux/seq_file.h>
22
22
#include <linux/screen_info.h>
23
23
#include <linux/init.h>
···
27
27
#include <linux/smp.h>
28
28
#include <linux/fs.h>
29
29
#include <linux/proc_fs.h>
30
-
#include <linux/memblock.h>
31
30
#include <linux/elf.h>
32
31
#include <linux/io.h>
33
32
+1
-2
arch/unicore32/mm/init.c
+1
-2
arch/unicore32/mm/init.c
···
11
11
#include <linux/errno.h>
12
12
#include <linux/swap.h>
13
13
#include <linux/init.h>
14
-
#include <linux/bootmem.h>
14
+
#include <linux/memblock.h>
15
15
#include <linux/mman.h>
16
16
#include <linux/nodemask.h>
17
17
#include <linux/initrd.h>
18
18
#include <linux/highmem.h>
19
19
#include <linux/gfp.h>
20
-
#include <linux/memblock.h>
21
20
#include <linux/sort.h>
22
21
#include <linux/dma-mapping.h>
23
22
#include <linux/export.h>
-1
arch/unicore32/mm/mmu.c
-1
arch/unicore32/mm/mmu.c
+1
-1
arch/x86/kernel/acpi/boot.c
+1
-1
arch/x86/kernel/acpi/boot.c
-1
arch/x86/kernel/acpi/sleep.c
-1
arch/x86/kernel/acpi/sleep.c
+1
-1
arch/x86/kernel/apic/apic.c
+1
-1
arch/x86/kernel/apic/apic.c
+1
-1
arch/x86/kernel/apic/io_apic.c
+1
-1
arch/x86/kernel/apic/io_apic.c
+1
-1
arch/x86/kernel/cpu/common.c
+1
-1
arch/x86/kernel/cpu/common.c
+1
-2
arch/x86/kernel/e820.c
+1
-2
arch/x86/kernel/e820.c
···
9
9
* allocation code routines via a platform independent interface (memblock, etc.).
10
10
*/
11
11
#include <linux/crash_dump.h>
12
-
#include <linux/bootmem.h>
12
+
#include <linux/memblock.h>
13
13
#include <linux/suspend.h>
14
14
#include <linux/acpi.h>
15
15
#include <linux/firmware-map.h>
16
-
#include <linux/memblock.h>
17
16
#include <linux/sort.h>
18
17
19
18
#include <asm/e820/api.h>
-1
arch/x86/kernel/mpparse.c
-1
arch/x86/kernel/mpparse.c
+1
-1
arch/x86/kernel/pci-dma.c
+1
-1
arch/x86/kernel/pci-dma.c
+1
-1
arch/x86/kernel/pci-swiotlb.c
+1
-1
arch/x86/kernel/pci-swiotlb.c
+1
-1
arch/x86/kernel/pvclock.c
+1
-1
arch/x86/kernel/pvclock.c
-1
arch/x86/kernel/setup.c
-1
arch/x86/kernel/setup.c
-1
arch/x86/kernel/setup_percpu.c
-1
arch/x86/kernel/setup_percpu.c
+1
-1
arch/x86/kernel/smpboot.c
+1
-1
arch/x86/kernel/smpboot.c
-1
arch/x86/kernel/tce_64.c
-1
arch/x86/kernel/tce_64.c
-1
arch/x86/mm/amdtopology.c
-1
arch/x86/mm/amdtopology.c
+1
-1
arch/x86/mm/fault.c
+1
-1
arch/x86/mm/fault.c
···
8
8
#include <linux/sched/task_stack.h> /* task_stack_*(), ... */
9
9
#include <linux/kdebug.h> /* oops_begin/end, ... */
10
10
#include <linux/extable.h> /* search_exception_tables */
11
-
#include <linux/bootmem.h> /* max_low_pfn */
11
+
#include <linux/memblock.h> /* max_low_pfn */
12
12
#include <linux/kprobes.h> /* NOKPROBE_SYMBOL, ... */
13
13
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
14
14
#include <linux/perf_event.h> /* perf_sw_event */
+1
-1
arch/x86/mm/highmem_32.c
+1
-1
arch/x86/mm/highmem_32.c
-1
arch/x86/mm/init.c
-1
arch/x86/mm/init.c
-1
arch/x86/mm/init_32.c
-1
arch/x86/mm/init_32.c
-1
arch/x86/mm/init_64.c
-1
arch/x86/mm/init_64.c
+1
-1
arch/x86/mm/ioremap.c
+1
-1
arch/x86/mm/ioremap.c
+1
-2
arch/x86/mm/kasan_init_64.c
+1
-2
arch/x86/mm/kasan_init_64.c
···
5
5
/* cpu_feature_enabled() cannot be used this early */
6
6
#define USE_EARLY_PGTABLE_L5
7
7
8
-
#include <linux/bootmem.h>
8
+
#include <linux/memblock.h>
9
9
#include <linux/kasan.h>
10
10
#include <linux/kdebug.h>
11
-
#include <linux/memblock.h>
12
11
#include <linux/mm.h>
13
12
#include <linux/sched.h>
14
13
#include <linux/sched/task.h>
+1
arch/x86/mm/kaslr.c
+1
arch/x86/mm/kaslr.c
-1
arch/x86/mm/numa.c
-1
arch/x86/mm/numa.c
-1
arch/x86/mm/numa_32.c
-1
arch/x86/mm/numa_32.c
+1
-1
arch/x86/mm/numa_64.c
+1
-1
arch/x86/mm/numa_64.c
-1
arch/x86/mm/numa_emulation.c
-1
arch/x86/mm/numa_emulation.c
+1
-1
arch/x86/mm/pageattr-test.c
+1
-1
arch/x86/mm/pageattr-test.c
···
5
5
* Clears the a test pte bit on random pages in the direct mapping,
6
6
* then reverts and compares page tables forwards and afterwards.
7
7
*/
8
-
#include <linux/bootmem.h>
8
+
#include <linux/memblock.h>
9
9
#include <linux/kthread.h>
10
10
#include <linux/random.h>
11
11
#include <linux/kernel.h>
+1
-1
arch/x86/mm/pageattr.c
+1
-1
arch/x86/mm/pageattr.c
+1
-1
arch/x86/mm/pat.c
+1
-1
arch/x86/mm/pat.c
+1
-1
arch/x86/mm/physaddr.c
+1
-1
arch/x86/mm/physaddr.c
+1
-1
arch/x86/pci/i386.c
+1
-1
arch/x86/pci/i386.c
+1
-2
arch/x86/platform/efi/efi.c
+1
-2
arch/x86/platform/efi/efi.c
···
36
36
#include <linux/efi.h>
37
37
#include <linux/efi-bgrt.h>
38
38
#include <linux/export.h>
39
-
#include <linux/bootmem.h>
40
-
#include <linux/slab.h>
41
39
#include <linux/memblock.h>
40
+
#include <linux/slab.h>
42
41
#include <linux/spinlock.h>
43
42
#include <linux/uaccess.h>
44
43
#include <linux/time.h>
+1
-1
arch/x86/platform/efi/efi_64.c
+1
-1
arch/x86/platform/efi/efi_64.c
-1
arch/x86/platform/efi/quirks.c
-1
arch/x86/platform/efi/quirks.c
+1
-1
arch/x86/platform/olpc/olpc_dt.c
+1
-1
arch/x86/platform/olpc/olpc_dt.c
+1
-1
arch/x86/power/hibernate_32.c
+1
-1
arch/x86/power/hibernate_32.c
+1
-1
arch/x86/xen/enlighten.c
+1
-1
arch/x86/xen/enlighten.c
+1
-2
arch/x86/xen/enlighten_pv.c
+1
-2
arch/x86/xen/enlighten_pv.c
···
23
23
#include <linux/start_kernel.h>
24
24
#include <linux/sched.h>
25
25
#include <linux/kprobes.h>
26
-
#include <linux/bootmem.h>
26
+
#include <linux/memblock.h>
27
27
#include <linux/export.h>
28
28
#include <linux/mm.h>
29
29
#include <linux/page-flags.h>
···
31
31
#include <linux/console.h>
32
32
#include <linux/pci.h>
33
33
#include <linux/gfp.h>
34
-
#include <linux/memblock.h>
35
34
#include <linux/edd.h>
36
35
#include <linux/frame.h>
37
36
-1
arch/x86/xen/p2m.c
-1
arch/x86/xen/p2m.c
+1
-1
arch/xtensa/kernel/pci.c
+1
-1
arch/xtensa/kernel/pci.c
+1
-1
arch/xtensa/mm/cache.c
+1
-1
arch/xtensa/mm/cache.c
+1
-1
arch/xtensa/mm/init.c
+1
-1
arch/xtensa/mm/init.c
+1
-2
arch/xtensa/mm/kasan_init.c
+1
-2
arch/xtensa/mm/kasan_init.c
···
8
8
* Copyright (C) 2017 Cadence Design Systems Inc.
9
9
*/
10
10
11
-
#include <linux/bootmem.h>
11
+
#include <linux/memblock.h>
12
12
#include <linux/init_task.h>
13
13
#include <linux/kasan.h>
14
14
#include <linux/kernel.h>
15
-
#include <linux/memblock.h>
16
15
#include <asm/initialize_mmu.h>
17
16
#include <asm/tlbflush.h>
18
17
#include <asm/traps.h>
+1
-1
arch/xtensa/mm/mmu.c
+1
-1
arch/xtensa/mm/mmu.c
+1
-1
arch/xtensa/platforms/iss/network.c
+1
-1
arch/xtensa/platforms/iss/network.c
+1
-1
arch/xtensa/platforms/iss/setup.c
+1
-1
arch/xtensa/platforms/iss/setup.c
+1
-1
block/blk-settings.c
+1
-1
block/blk-settings.c
···
6
6
#include <linux/init.h>
7
7
#include <linux/bio.h>
8
8
#include <linux/blkdev.h>
9
-
#include <linux/bootmem.h> /* for max_pfn/max_low_pfn */
9
+
#include <linux/memblock.h> /* for max_pfn/max_low_pfn */
10
10
#include <linux/gcd.h>
11
11
#include <linux/lcm.h>
12
12
#include <linux/jiffies.h>
+1
-1
block/bounce.c
+1
-1
block/bounce.c
-1
drivers/acpi/numa.c
-1
drivers/acpi/numa.c
+1
-2
drivers/acpi/tables.c
+1
-2
drivers/acpi/tables.c
+1
-1
drivers/base/platform.c
+1
-1
drivers/base/platform.c
+1
-1
drivers/clk/ti/clk.c
+1
-1
drivers/clk/ti/clk.c
+1
-1
drivers/firmware/dmi_scan.c
+1
-1
drivers/firmware/dmi_scan.c
+1
-1
drivers/firmware/efi/apple-properties.c
+1
-1
drivers/firmware/efi/apple-properties.c
+1
-1
drivers/firmware/iscsi_ibft_find.c
+1
-1
drivers/firmware/iscsi_ibft_find.c
+1
-1
drivers/firmware/memmap.c
+1
-1
drivers/firmware/memmap.c
+1
-1
drivers/iommu/mtk_iommu.c
+1
-1
drivers/iommu/mtk_iommu.c
+1
-1
drivers/iommu/mtk_iommu_v1.c
+1
-1
drivers/iommu/mtk_iommu_v1.c
+1
-2
drivers/macintosh/smu.c
+1
-2
drivers/macintosh/smu.c
···
23
23
#include <linux/kernel.h>
24
24
#include <linux/device.h>
25
25
#include <linux/dmapool.h>
26
-
#include <linux/bootmem.h>
26
+
#include <linux/memblock.h>
27
27
#include <linux/vmalloc.h>
28
28
#include <linux/highmem.h>
29
29
#include <linux/jiffies.h>
···
38
38
#include <linux/of_irq.h>
39
39
#include <linux/of_platform.h>
40
40
#include <linux/slab.h>
41
-
#include <linux/memblock.h>
42
41
#include <linux/sched/signal.h>
43
42
44
43
#include <asm/byteorder.h>
+1
-1
drivers/mtd/ar7part.c
+1
-1
drivers/mtd/ar7part.c
+1
-1
drivers/net/arcnet/arc-rimi.c
+1
-1
drivers/net/arcnet/arc-rimi.c
+1
-1
drivers/net/arcnet/com20020-isa.c
+1
-1
drivers/net/arcnet/com20020-isa.c
+1
-1
drivers/net/arcnet/com90io.c
+1
-1
drivers/net/arcnet/com90io.c
-1
drivers/of/fdt.c
-1
drivers/of/fdt.c
+1
-1
drivers/of/unittest.c
+1
-1
drivers/of/unittest.c
+1
-1
drivers/s390/char/fs3270.c
+1
-1
drivers/s390/char/fs3270.c
+1
-1
drivers/s390/char/tty3270.c
+1
-1
drivers/s390/char/tty3270.c
+1
-1
drivers/s390/cio/cmf.c
+1
-1
drivers/s390/cio/cmf.c
+1
-1
drivers/s390/virtio/virtio_ccw.c
+1
-1
drivers/s390/virtio/virtio_ccw.c
+1
-1
drivers/sfi/sfi_core.c
+1
-1
drivers/sfi/sfi_core.c
+1
-1
drivers/tty/serial/cpm_uart/cpm_uart_core.c
+1
-1
drivers/tty/serial/cpm_uart/cpm_uart_core.c
+1
-1
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
+1
-1
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
+1
-1
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
+1
-1
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
-1
drivers/usb/early/xhci-dbc.c
-1
drivers/usb/early/xhci-dbc.c
+1
-1
drivers/xen/balloon.c
+1
-1
drivers/xen/balloon.c
+1
-1
drivers/xen/events/events_base.c
+1
-1
drivers/xen/events/events_base.c
+1
-1
drivers/xen/grant-table.c
+1
-1
drivers/xen/grant-table.c
-1
drivers/xen/swiotlb-xen.c
-1
drivers/xen/swiotlb-xen.c
+1
-1
drivers/xen/xen-selfballoon.c
+1
-1
drivers/xen/xen-selfballoon.c
+1
-1
fs/dcache.c
+1
-1
fs/dcache.c
+1
-1
fs/inode.c
+1
-1
fs/inode.c
+1
-1
fs/namespace.c
+1
-1
fs/namespace.c
+1
-1
fs/proc/kcore.c
+1
-1
fs/proc/kcore.c
+1
-1
fs/proc/page.c
+1
-1
fs/proc/page.c
+1
-1
fs/proc/vmcore.c
+1
-1
fs/proc/vmcore.c
-173
include/linux/bootmem.h
-173
include/linux/bootmem.h
···
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 */
+147
-4
include/linux/memblock.h
+147
-4
include/linux/memblock.h
···
15
15
16
16
#include <linux/init.h>
17
17
#include <linux/mm.h>
18
+
#include <asm/dma.h>
19
+
20
+
extern unsigned long max_low_pfn;
21
+
extern unsigned long min_low_pfn;
22
+
23
+
/*
24
+
* highest page
25
+
*/
26
+
extern unsigned long max_pfn;
27
+
/*
28
+
* highest possible page
29
+
*/
30
+
extern unsigned long long max_possible_pfn;
18
31
19
32
#define INIT_MEMBLOCK_REGIONS 128
20
33
#define INIT_PHYSMEM_REGIONS 4
···
131
118
int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);
132
119
int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);
133
120
enum memblock_flags choose_memblock_flags(void);
121
+
122
+
unsigned long memblock_free_all(void);
123
+
void reset_node_managed_pages(pg_data_t *pgdat);
124
+
void reset_all_zones_managed_pages(void);
134
125
135
126
/* Low level functions */
136
127
int memblock_add_range(struct memblock_type *type,
···
317
300
}
318
301
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
319
302
303
+
/* Flags for memblock allocation APIs */
304
+
#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
305
+
#define MEMBLOCK_ALLOC_ACCESSIBLE 0
306
+
307
+
/* We are using top down, so it is safe to use 0 here */
308
+
#define MEMBLOCK_LOW_LIMIT 0
309
+
310
+
#ifndef ARCH_LOW_ADDRESS_LIMIT
311
+
#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
312
+
#endif
313
+
320
314
phys_addr_t memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid);
321
315
phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
322
316
323
317
phys_addr_t memblock_phys_alloc(phys_addr_t size, phys_addr_t align);
318
+
319
+
void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
320
+
phys_addr_t min_addr, phys_addr_t max_addr,
321
+
int nid);
322
+
void *memblock_alloc_try_nid_nopanic(phys_addr_t size, phys_addr_t align,
323
+
phys_addr_t min_addr, phys_addr_t max_addr,
324
+
int nid);
325
+
void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
326
+
phys_addr_t min_addr, phys_addr_t max_addr,
327
+
int nid);
328
+
329
+
static inline void * __init memblock_alloc(phys_addr_t size, phys_addr_t align)
330
+
{
331
+
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
332
+
MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
333
+
}
334
+
335
+
static inline void * __init memblock_alloc_raw(phys_addr_t size,
336
+
phys_addr_t align)
337
+
{
338
+
return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT,
339
+
MEMBLOCK_ALLOC_ACCESSIBLE,
340
+
NUMA_NO_NODE);
341
+
}
342
+
343
+
static inline void * __init memblock_alloc_from(phys_addr_t size,
344
+
phys_addr_t align,
345
+
phys_addr_t min_addr)
346
+
{
347
+
return memblock_alloc_try_nid(size, align, min_addr,
348
+
MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
349
+
}
350
+
351
+
static inline void * __init memblock_alloc_nopanic(phys_addr_t size,
352
+
phys_addr_t align)
353
+
{
354
+
return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT,
355
+
MEMBLOCK_ALLOC_ACCESSIBLE,
356
+
NUMA_NO_NODE);
357
+
}
358
+
359
+
static inline void * __init memblock_alloc_low(phys_addr_t size,
360
+
phys_addr_t align)
361
+
{
362
+
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
363
+
ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE);
364
+
}
365
+
static inline void * __init memblock_alloc_low_nopanic(phys_addr_t size,
366
+
phys_addr_t align)
367
+
{
368
+
return memblock_alloc_try_nid_nopanic(size, align, MEMBLOCK_LOW_LIMIT,
369
+
ARCH_LOW_ADDRESS_LIMIT,
370
+
NUMA_NO_NODE);
371
+
}
372
+
373
+
static inline void * __init memblock_alloc_from_nopanic(phys_addr_t size,
374
+
phys_addr_t align,
375
+
phys_addr_t min_addr)
376
+
{
377
+
return memblock_alloc_try_nid_nopanic(size, align, min_addr,
378
+
MEMBLOCK_ALLOC_ACCESSIBLE,
379
+
NUMA_NO_NODE);
380
+
}
381
+
382
+
static inline void * __init memblock_alloc_node(phys_addr_t size,
383
+
phys_addr_t align, int nid)
384
+
{
385
+
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
386
+
MEMBLOCK_ALLOC_ACCESSIBLE, nid);
387
+
}
388
+
389
+
static inline void * __init memblock_alloc_node_nopanic(phys_addr_t size,
390
+
int nid)
391
+
{
392
+
return memblock_alloc_try_nid_nopanic(size, 0, MEMBLOCK_LOW_LIMIT,
393
+
MEMBLOCK_ALLOC_ACCESSIBLE, nid);
394
+
}
395
+
396
+
static inline void __init memblock_free_early(phys_addr_t base,
397
+
phys_addr_t size)
398
+
{
399
+
__memblock_free_early(base, size);
400
+
}
401
+
402
+
static inline void __init memblock_free_early_nid(phys_addr_t base,
403
+
phys_addr_t size, int nid)
404
+
{
405
+
__memblock_free_early(base, size);
406
+
}
407
+
408
+
static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
409
+
{
410
+
__memblock_free_late(base, size);
411
+
}
324
412
325
413
/*
326
414
* Set the allocation direction to bottom-up or top-down.
···
444
322
{
445
323
return memblock.bottom_up;
446
324
}
447
-
448
-
/* Flags for memblock_alloc_base() amd __memblock_alloc_base() */
449
-
#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
450
-
#define MEMBLOCK_ALLOC_ACCESSIBLE 0
451
325
452
326
phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
453
327
phys_addr_t start, phys_addr_t end,
···
549
431
for (i = 0, rgn = &memblock_type->regions[0]; \
550
432
i < memblock_type->cnt; \
551
433
i++, rgn = &memblock_type->regions[i])
434
+
435
+
extern void *alloc_large_system_hash(const char *tablename,
436
+
unsigned long bucketsize,
437
+
unsigned long numentries,
438
+
int scale,
439
+
int flags,
440
+
unsigned int *_hash_shift,
441
+
unsigned int *_hash_mask,
442
+
unsigned long low_limit,
443
+
unsigned long high_limit);
444
+
445
+
#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
446
+
#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min
447
+
* shift passed via *_hash_shift */
448
+
#define HASH_ZERO 0x00000004 /* Zero allocated hash table */
449
+
450
+
/* Only NUMA needs hash distribution. 64bit NUMA architectures have
451
+
* sufficient vmalloc space.
452
+
*/
453
+
#ifdef CONFIG_NUMA
454
+
#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
455
+
extern int hashdist; /* Distribute hashes across NUMA nodes? */
456
+
#else
457
+
#define hashdist (0)
458
+
#endif
552
459
553
460
#ifdef CONFIG_MEMTEST
554
461
extern void early_memtest(phys_addr_t start, phys_addr_t end);
+1
-1
init/main.c
+1
-1
init/main.c
+1
-1
kernel/dma/direct.c
+1
-1
kernel/dma/direct.c
+1
-1
kernel/dma/swiotlb.c
+1
-1
kernel/dma/swiotlb.c
+1
-1
kernel/futex.c
+1
-1
kernel/futex.c
+1
-1
kernel/locking/qspinlock_paravirt.h
+1
-1
kernel/locking/qspinlock_paravirt.h
+1
-1
kernel/pid.c
+1
-1
kernel/pid.c
+1
-1
kernel/power/snapshot.c
+1
-1
kernel/power/snapshot.c
-1
kernel/printk/printk.c
-1
kernel/printk/printk.c
+1
-1
kernel/profile.c
+1
-1
kernel/profile.c
+1
-1
lib/cpumask.c
+1
-1
lib/cpumask.c
-1
mm/hugetlb.c
-1
mm/hugetlb.c
+1
-2
mm/kasan/kasan_init.c
+1
-2
mm/kasan/kasan_init.c
···
10
10
*
11
11
*/
12
12
13
-
#include <linux/bootmem.h>
13
+
#include <linux/memblock.h>
14
14
#include <linux/init.h>
15
15
#include <linux/kasan.h>
16
16
#include <linux/kernel.h>
17
-
#include <linux/memblock.h>
18
17
#include <linux/mm.h>
19
18
#include <linux/pfn.h>
20
19
#include <linux/slab.h>
+1
-1
mm/kmemleak.c
+1
-1
mm/kmemleak.c
-1
mm/memblock.c
-1
mm/memblock.c
-1
mm/memory_hotplug.c
-1
mm/memory_hotplug.c
-1
mm/page_alloc.c
-1
mm/page_alloc.c
+1
-1
mm/page_ext.c
+1
-1
mm/page_ext.c
+1
-1
mm/page_idle.c
+1
-1
mm/page_idle.c
+1
-1
mm/page_owner.c
+1
-1
mm/page_owner.c
+1
-1
mm/percpu.c
+1
-1
mm/percpu.c
-1
mm/sparse-vmemmap.c
-1
mm/sparse-vmemmap.c
-1
mm/sparse.c
-1
mm/sparse.c
+1
-1
net/ipv4/inet_hashtables.c
+1
-1
net/ipv4/inet_hashtables.c
+1
-1
net/ipv4/tcp.c
+1
-1
net/ipv4/tcp.c
+1
-1
net/ipv4/udp.c
+1
-1
net/ipv4/udp.c
+1
-1
net/sctp/protocol.c
+1
-1
net/sctp/protocol.c