summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Rapoport <rppt@linux.vnet.ibm.com>2018-10-30 18:09:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-31 11:54:16 -0400
commit57c8a661d95dff48dd9c2f2496139082bbaf241a (patch)
treea4d49d0232149047f9c0032e22b7fa779e75d61f /drivers
parent97ad1087efffed26cb00e310a927f9603332dfcb (diff)
mm: remove include/linux/bootmem.h
Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/numa.c1
-rw-r--r--drivers/acpi/tables.c3
-rw-r--r--drivers/base/platform.c2
-rw-r--r--drivers/clk/ti/clk.c2
-rw-r--r--drivers/firmware/dmi_scan.c2
-rw-r--r--drivers/firmware/efi/apple-properties.c2
-rw-r--r--drivers/firmware/iscsi_ibft_find.c2
-rw-r--r--drivers/firmware/memmap.c2
-rw-r--r--drivers/iommu/mtk_iommu.c2
-rw-r--r--drivers/iommu/mtk_iommu_v1.c2
-rw-r--r--drivers/macintosh/smu.c3
-rw-r--r--drivers/mtd/ar7part.c2
-rw-r--r--drivers/net/arcnet/arc-rimi.c2
-rw-r--r--drivers/net/arcnet/com20020-isa.c2
-rw-r--r--drivers/net/arcnet/com90io.c2
-rw-r--r--drivers/of/fdt.c1
-rw-r--r--drivers/of/unittest.c2
-rw-r--r--drivers/s390/char/fs3270.c2
-rw-r--r--drivers/s390/char/tty3270.c2
-rw-r--r--drivers/s390/cio/cmf.c2
-rw-r--r--drivers/s390/virtio/virtio_ccw.c2
-rw-r--r--drivers/sfi/sfi_core.c2
-rw-r--r--drivers/tty/serial/cpm_uart/cpm_uart_core.c2
-rw-r--r--drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c2
-rw-r--r--drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c2
-rw-r--r--drivers/usb/early/xhci-dbc.c1
-rw-r--r--drivers/xen/balloon.c2
-rw-r--r--drivers/xen/events/events_base.c2
-rw-r--r--drivers/xen/grant-table.c2
-rw-r--r--drivers/xen/swiotlb-xen.c1
-rw-r--r--drivers/xen/xen-selfballoon.c2
31 files changed, 27 insertions, 33 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 85167603b9c9..274699463b4f 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -27,7 +27,6 @@
27#include <linux/types.h> 27#include <linux/types.h>
28#include <linux/errno.h> 28#include <linux/errno.h>
29#include <linux/acpi.h> 29#include <linux/acpi.h>
30#include <linux/bootmem.h>
31#include <linux/memblock.h> 30#include <linux/memblock.h>
32#include <linux/numa.h> 31#include <linux/numa.h>
33#include <linux/nodemask.h> 32#include <linux/nodemask.h>
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a3d012b08fc5..61203eebf3a1 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -31,9 +31,8 @@
31#include <linux/irq.h> 31#include <linux/irq.h>
32#include <linux/errno.h> 32#include <linux/errno.h>
33#include <linux/acpi.h> 33#include <linux/acpi.h>
34#include <linux/bootmem.h>
35#include <linux/earlycpio.h>
36#include <linux/memblock.h> 34#include <linux/memblock.h>
35#include <linux/earlycpio.h>
37#include <linux/initrd.h> 36#include <linux/initrd.h>
38#include "internal.h" 37#include "internal.h"
39 38
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 23cf4427f425..41b91af95afb 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -16,7 +16,7 @@
16#include <linux/module.h> 16#include <linux/module.h>
17#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/dma-mapping.h> 18#include <linux/dma-mapping.h>
19#include <linux/bootmem.h> 19#include <linux/memblock.h>
20#include <linux/err.h> 20#include <linux/err.h>
21#include <linux/slab.h> 21#include <linux/slab.h>
22#include <linux/pm_runtime.h> 22#include <linux/pm_runtime.h>
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c
index 5c54d3734daf..5b2867a33b98 100644
--- a/drivers/clk/ti/clk.c
+++ b/drivers/clk/ti/clk.c
@@ -23,7 +23,7 @@
23#include <linux/of_address.h> 23#include <linux/of_address.h>
24#include <linux/list.h> 24#include <linux/list.h>
25#include <linux/regmap.h> 25#include <linux/regmap.h>
26#include <linux/bootmem.h> 26#include <linux/memblock.h>
27#include <linux/device.h> 27#include <linux/device.h>
28 28
29#include "clock.h" 29#include "clock.h"
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index f2483548cde9..099d83e4e910 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -5,7 +5,7 @@
5#include <linux/ctype.h> 5#include <linux/ctype.h>
6#include <linux/dmi.h> 6#include <linux/dmi.h>
7#include <linux/efi.h> 7#include <linux/efi.h>
8#include <linux/bootmem.h> 8#include <linux/memblock.h>
9#include <linux/random.h> 9#include <linux/random.h>
10#include <asm/dmi.h> 10#include <asm/dmi.h>
11#include <asm/unaligned.h> 11#include <asm/unaligned.h>
diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c
index 2b675f788b61..ac1654f74dc7 100644
--- a/drivers/firmware/efi/apple-properties.c
+++ b/drivers/firmware/efi/apple-properties.c
@@ -20,7 +20,7 @@
20 20
21#define pr_fmt(fmt) "apple-properties: " fmt 21#define pr_fmt(fmt) "apple-properties: " fmt
22 22
23#include <linux/bootmem.h> 23#include <linux/memblock.h>
24#include <linux/efi.h> 24#include <linux/efi.h>
25#include <linux/io.h> 25#include <linux/io.h>
26#include <linux/platform_data/x86/apple.h> 26#include <linux/platform_data/x86/apple.h>
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index 2224f1dc074b..72d9ea18270b 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -18,7 +18,7 @@
18 * GNU General Public License for more details. 18 * GNU General Public License for more details.
19 */ 19 */
20 20
21#include <linux/bootmem.h> 21#include <linux/memblock.h>
22#include <linux/blkdev.h> 22#include <linux/blkdev.h>
23#include <linux/ctype.h> 23#include <linux/ctype.h>
24#include <linux/device.h> 24#include <linux/device.h>
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index 03cead6d5f97..2a23453f005a 100644
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -19,7 +19,7 @@
19#include <linux/kernel.h> 19#include <linux/kernel.h>
20#include <linux/module.h> 20#include <linux/module.h>
21#include <linux/types.h> 21#include <linux/types.h>
22#include <linux/bootmem.h> 22#include <linux/memblock.h>
23#include <linux/slab.h> 23#include <linux/slab.h>
24#include <linux/mm.h> 24#include <linux/mm.h>
25 25
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index f9f69f7111a9..44bd5b9166bb 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -11,7 +11,7 @@
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 */ 13 */
14#include <linux/bootmem.h> 14#include <linux/memblock.h>
15#include <linux/bug.h> 15#include <linux/bug.h>
16#include <linux/clk.h> 16#include <linux/clk.h>
17#include <linux/component.h> 17#include <linux/component.h>
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index 676c029494e4..0e780848f59b 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -13,7 +13,7 @@
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 */ 15 */
16#include <linux/bootmem.h> 16#include <linux/memblock.h>
17#include <linux/bug.h> 17#include <linux/bug.h>
18#include <linux/clk.h> 18#include <linux/clk.h>
19#include <linux/component.h> 19#include <linux/component.h>
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 0069f9084f9f..880a81c82b7a 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -23,7 +23,7 @@
23#include <linux/kernel.h> 23#include <linux/kernel.h>
24#include <linux/device.h> 24#include <linux/device.h>
25#include <linux/dmapool.h> 25#include <linux/dmapool.h>
26#include <linux/bootmem.h> 26#include <linux/memblock.h>
27#include <linux/vmalloc.h> 27#include <linux/vmalloc.h>
28#include <linux/highmem.h> 28#include <linux/highmem.h>
29#include <linux/jiffies.h> 29#include <linux/jiffies.h>
@@ -38,7 +38,6 @@
38#include <linux/of_irq.h> 38#include <linux/of_irq.h>
39#include <linux/of_platform.h> 39#include <linux/of_platform.h>
40#include <linux/slab.h> 40#include <linux/slab.h>
41#include <linux/memblock.h>
42#include <linux/sched/signal.h> 41#include <linux/sched/signal.h>
43 42
44#include <asm/byteorder.h> 43#include <asm/byteorder.h>
diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
index fc15ec58230a..0d33cf0842ad 100644
--- a/drivers/mtd/ar7part.c
+++ b/drivers/mtd/ar7part.c
@@ -25,7 +25,7 @@
25 25
26#include <linux/mtd/mtd.h> 26#include <linux/mtd/mtd.h>
27#include <linux/mtd/partitions.h> 27#include <linux/mtd/partitions.h>
28#include <linux/bootmem.h> 28#include <linux/memblock.h>
29#include <linux/module.h> 29#include <linux/module.h>
30 30
31#include <uapi/linux/magic.h> 31#include <uapi/linux/magic.h>
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index a07e24970be4..11c5bad95226 100644
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -33,7 +33,7 @@
33#include <linux/ioport.h> 33#include <linux/ioport.h>
34#include <linux/delay.h> 34#include <linux/delay.h>
35#include <linux/netdevice.h> 35#include <linux/netdevice.h>
36#include <linux/bootmem.h> 36#include <linux/memblock.h>
37#include <linux/init.h> 37#include <linux/init.h>
38#include <linux/interrupt.h> 38#include <linux/interrupt.h>
39#include <linux/io.h> 39#include <linux/io.h>
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index 38fa60ddaf2e..28510e33924f 100644
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -38,7 +38,7 @@
38#include <linux/netdevice.h> 38#include <linux/netdevice.h>
39#include <linux/init.h> 39#include <linux/init.h>
40#include <linux/interrupt.h> 40#include <linux/interrupt.h>
41#include <linux/bootmem.h> 41#include <linux/memblock.h>
42#include <linux/io.h> 42#include <linux/io.h>
43 43
44#include "arcdevice.h" 44#include "arcdevice.h"
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 4e56aaf2b984..2c546013a980 100644
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -34,7 +34,7 @@
34#include <linux/ioport.h> 34#include <linux/ioport.h>
35#include <linux/delay.h> 35#include <linux/delay.h>
36#include <linux/netdevice.h> 36#include <linux/netdevice.h>
37#include <linux/bootmem.h> 37#include <linux/memblock.h>
38#include <linux/init.h> 38#include <linux/init.h>
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/io.h> 40#include <linux/io.h>
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ffe62a7ae19b..bb532aae0d92 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -11,7 +11,6 @@
11#include <linux/crc32.h> 11#include <linux/crc32.h>
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/initrd.h> 13#include <linux/initrd.h>
14#include <linux/bootmem.h>
15#include <linux/memblock.h> 14#include <linux/memblock.h>
16#include <linux/mutex.h> 15#include <linux/mutex.h>
17#include <linux/of.h> 16#include <linux/of.h>
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 01e23b85e798..49ae2aa744d6 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -5,7 +5,7 @@
5 5
6#define pr_fmt(fmt) "### dt-test ### " fmt 6#define pr_fmt(fmt) "### dt-test ### " fmt
7 7
8#include <linux/bootmem.h> 8#include <linux/memblock.h>
9#include <linux/clk.h> 9#include <linux/clk.h>
10#include <linux/err.h> 10#include <linux/err.h>
11#include <linux/errno.h> 11#include <linux/errno.h>
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 16a4e8528bbc..8f3a2eeb28dc 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -8,7 +8,7 @@
8 * Copyright IBM Corp. 2003, 2009 8 * Copyright IBM Corp. 2003, 2009
9 */ 9 */
10 10
11#include <linux/bootmem.h> 11#include <linux/memblock.h>
12#include <linux/console.h> 12#include <linux/console.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 5b8af2782282..2b0c36c2c568 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -19,7 +19,7 @@
19#include <linux/workqueue.h> 19#include <linux/workqueue.h>
20 20
21#include <linux/slab.h> 21#include <linux/slab.h>
22#include <linux/bootmem.h> 22#include <linux/memblock.h>
23#include <linux/compat.h> 23#include <linux/compat.h>
24 24
25#include <asm/ccwdev.h> 25#include <asm/ccwdev.h>
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 8af4948dae80..72dd2471ec1e 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -13,7 +13,7 @@
13#define KMSG_COMPONENT "cio" 13#define KMSG_COMPONENT "cio"
14#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt 14#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
15 15
16#include <linux/bootmem.h> 16#include <linux/memblock.h>
17#include <linux/device.h> 17#include <linux/device.h>
18#include <linux/init.h> 18#include <linux/init.h>
19#include <linux/list.h> 19#include <linux/list.h>
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 8f5c1d7f751a..97b6f197f007 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -9,7 +9,7 @@
9 9
10#include <linux/kernel_stat.h> 10#include <linux/kernel_stat.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/bootmem.h> 12#include <linux/memblock.h>
13#include <linux/err.h> 13#include <linux/err.h>
14#include <linux/virtio.h> 14#include <linux/virtio.h>
15#include <linux/virtio_config.h> 15#include <linux/virtio_config.h>
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index 153b3f3cc795..a5136901dd8a 100644
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -59,7 +59,7 @@
59#define KMSG_COMPONENT "SFI" 59#define KMSG_COMPONENT "SFI"
60#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt 60#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
61 61
62#include <linux/bootmem.h> 62#include <linux/memblock.h>
63#include <linux/kernel.h> 63#include <linux/kernel.h>
64#include <linux/module.h> 64#include <linux/module.h>
65#include <linux/errno.h> 65#include <linux/errno.h>
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 79ad30d34949..b929c7ae3a27 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -24,7 +24,7 @@
24#include <linux/console.h> 24#include <linux/console.h>
25#include <linux/sysrq.h> 25#include <linux/sysrq.h>
26#include <linux/device.h> 26#include <linux/device.h>
27#include <linux/bootmem.h> 27#include <linux/memblock.h>
28#include <linux/dma-mapping.h> 28#include <linux/dma-mapping.h>
29#include <linux/fs_uart_pd.h> 29#include <linux/fs_uart_pd.h>
30#include <linux/of_address.h> 30#include <linux/of_address.h>
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
index 4eba17f3d293..56fc527015cb 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
@@ -19,7 +19,7 @@
19#include <linux/console.h> 19#include <linux/console.h>
20#include <linux/sysrq.h> 20#include <linux/sysrq.h>
21#include <linux/device.h> 21#include <linux/device.h>
22#include <linux/bootmem.h> 22#include <linux/memblock.h>
23#include <linux/dma-mapping.h> 23#include <linux/dma-mapping.h>
24 24
25#include <asm/io.h> 25#include <asm/io.h>
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
index e3bff068dc3c..6a1cd03bfe39 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
@@ -19,7 +19,7 @@
19#include <linux/console.h> 19#include <linux/console.h>
20#include <linux/sysrq.h> 20#include <linux/sysrq.h>
21#include <linux/device.h> 21#include <linux/device.h>
22#include <linux/bootmem.h> 22#include <linux/memblock.h>
23#include <linux/dma-mapping.h> 23#include <linux/dma-mapping.h>
24 24
25#include <asm/io.h> 25#include <asm/io.h>
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index ddc5fa88f268..d2652dccc699 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -12,7 +12,6 @@
12#include <linux/console.h> 12#include <linux/console.h>
13#include <linux/pci_regs.h> 13#include <linux/pci_regs.h>
14#include <linux/pci_ids.h> 14#include <linux/pci_ids.h>
15#include <linux/bootmem.h>
16#include <linux/memblock.h> 15#include <linux/memblock.h>
17#include <linux/io.h> 16#include <linux/io.h>
18#include <asm/pci-direct.h> 17#include <asm/pci-direct.h>
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index e12bb256036f..a3f5cbfcd4a1 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -44,7 +44,7 @@
44#include <linux/cred.h> 44#include <linux/cred.h>
45#include <linux/errno.h> 45#include <linux/errno.h>
46#include <linux/mm.h> 46#include <linux/mm.h>
47#include <linux/bootmem.h> 47#include <linux/memblock.h>
48#include <linux/pagemap.h> 48#include <linux/pagemap.h>
49#include <linux/highmem.h> 49#include <linux/highmem.h>
50#include <linux/mutex.h> 50#include <linux/mutex.h>
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index e6c1934734b7..93194f3e7540 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -28,7 +28,7 @@
28#include <linux/irq.h> 28#include <linux/irq.h>
29#include <linux/moduleparam.h> 29#include <linux/moduleparam.h>
30#include <linux/string.h> 30#include <linux/string.h>
31#include <linux/bootmem.h> 31#include <linux/memblock.h>
32#include <linux/slab.h> 32#include <linux/slab.h>
33#include <linux/irqnr.h> 33#include <linux/irqnr.h>
34#include <linux/pci.h> 34#include <linux/pci.h>
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 84575baceebc..f15f89df1f36 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -33,7 +33,7 @@
33 33
34#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt 34#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
35 35
36#include <linux/bootmem.h> 36#include <linux/memblock.h>
37#include <linux/sched.h> 37#include <linux/sched.h>
38#include <linux/mm.h> 38#include <linux/mm.h>
39#include <linux/slab.h> 39#include <linux/slab.h>
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index c5f26a87d238..2a7f545bd0b5 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -35,7 +35,6 @@
35 35
36#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt 36#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
37 37
38#include <linux/bootmem.h>
39#include <linux/memblock.h> 38#include <linux/memblock.h>
40#include <linux/dma-direct.h> 39#include <linux/dma-direct.h>
41#include <linux/export.h> 40#include <linux/export.h>
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c
index 55988b8418ee..5165aa82bf7d 100644
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -68,7 +68,7 @@
68#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 68#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
69 69
70#include <linux/kernel.h> 70#include <linux/kernel.h>
71#include <linux/bootmem.h> 71#include <linux/memblock.h>
72#include <linux/swap.h> 72#include <linux/swap.h>
73#include <linux/mm.h> 73#include <linux/mm.h>
74#include <linux/mman.h> 74#include <linux/mman.h>
generated by cgit v1.2.2 (git 2.25.0) at 2025-10-15 05:13:26 -0400