Skip to content

Commit 57c8a66

Browse files
rppttorvalds
rppt
authored and
torvalds
committed
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>
1 parent 97ad108 commit 57c8a66

File tree

275 files changed

+353
-476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+353
-476
lines changed

‎arch/alpha/kernel/core_cia.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
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>

0 commit comments

Comments
 (0)