The patch titled
Subject: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
has been removed from the -mm tree. Its filename was
treewide-replace-include-asm-sizesh-with-include-linux-sizesh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Subject: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
Since dccd2304cc90 ("ARM: 7430/1: sizes.h: move from asm-generic to
<linux/sizes.h>"), <asm/sizes.h> and <asm-generic/sizes.h> are just
wrappers of <linux/sizes.h>.
This commit replaces all <asm/sizes.h> and <asm-generic/sizes.h> to
prepare for the removal.
Link: http://lkml.kernel.org/r/1553267665-27228-1-git-send-email-yamada.masahiro@xxxxxxxxxxxxx
Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/common/sa1111.c | 2 +-
arch/arm/mach-imx/devices/platform-fec.c | 2 +-
arch/arm/mach-imx/devices/platform-gpio_keys.c | 2 +-
arch/arm/mach-imx/devices/platform-imx2-wdt.c | 2 +-
arch/arm/mach-imx/devices/platform-mxc_nand.c | 2 +-
arch/arm/mach-imx/hardware.h | 2 +-
arch/arm/mach-integrator/impd1.c | 2 +-
arch/arm/mach-iop13xx/pci.c | 2 +-
arch/arm/mach-iop13xx/tpmi.c | 2 +-
arch/arm/mach-ixp4xx/common-pci.c | 2 +-
arch/arm/mach-ks8695/include/mach/hardware.h | 2 +-
arch/arm/mach-omap1/include/mach/hardware.h | 2 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 2 +-
arch/arm/mach-prima2/common.c | 2 +-
arch/arm/mach-pxa/balloon3.c | 2 +-
arch/arm/mach-pxa/colibri-pxa270.c | 2 +-
arch/arm/mach-pxa/colibri-pxa300.c | 2 +-
arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +-
arch/arm/mach-pxa/gumstix.c | 2 +-
arch/arm/mach-pxa/lpd270.c | 2 +-
arch/arm/mach-pxa/lubbock.c | 2 +-
arch/arm/mach-pxa/mainstone.c | 2 +-
arch/arm/mach-pxa/trizeps4.c | 2 +-
arch/arm/mach-pxa/viper.c | 2 +-
arch/arm/mach-s3c24xx/include/mach/hardware.h | 2 +-
arch/arm/mach-sa1100/include/mach/memory.h | 2 +-
arch/arm/mach-sa1100/neponset.c | 2 +-
arch/arm/mach-tegra/iomap.h | 2 +-
arch/arm/mach-tegra/irammap.h | 2 +-
arch/arm/mach-w90x900/include/mach/hardware.h | 2 +-
arch/arm64/include/asm/boot.h | 2 +-
arch/arm64/include/asm/memory.h | 2 +-
arch/arm64/mm/init.c | 2 +-
arch/arm64/mm/mmu.c | 2 +-
arch/nds32/include/asm/pgtable.h | 2 +-
arch/nds32/kernel/head.S | 2 +-
arch/sh/boards/board-apsh4a3a.c | 2 +-
arch/sh/boards/board-apsh4ad0a.c | 2 +-
arch/sh/boards/board-edosk7705.c | 2 +-
arch/sh/boards/board-edosk7760.c | 2 +-
arch/sh/boards/board-espt.c | 2 +-
arch/sh/boards/board-urquell.c | 2 +-
arch/sh/boards/mach-microdev/setup.c | 2 +-
arch/sh/boards/mach-sdk7786/fpga.c | 2 +-
arch/sh/boards/mach-sdk7786/setup.c | 2 +-
arch/sh/boards/mach-sdk7786/sram.c | 2 +-
arch/sh/boards/mach-se/7343/irq.c | 2 +-
arch/sh/boards/mach-se/7722/irq.c | 2 +-
arch/sh/drivers/pci/pci-sh7751.c | 2 +-
arch/sh/drivers/pci/pci-sh7780.c | 2 +-
arch/sh/drivers/pci/pcie-sh7786.c | 2 +-
arch/sh/mm/init.c | 2 +-
arch/sh/mm/pmb.c | 2 +-
arch/sh/mm/uncached.c | 2 +-
arch/unicore32/include/asm/memory.h | 2 +-
arch/unicore32/mm/init.c | 2 +-
arch/unicore32/mm/ioremap.c | 2 +-
arch/unicore32/mm/mmu.c | 2 +-
arch/x86/events/intel/bts.c | 2 +-
drivers/gpu/drm/msm/msm_drv.h | 2 +-
drivers/iommu/msm_iommu.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mmc/host/pxamci.c | 2 +-
drivers/mtd/maps/sa1100-flash.c | 2 +-
drivers/pcmcia/omap_cf.c | 2 +-
drivers/sh/intc/userimask.c | 2 +-
drivers/video/fbdev/fb-puv3.c | 2 +-
68 files changed, 68 insertions(+), 68 deletions(-)
--- a/arch/arm64/include/asm/boot.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm64/include/asm/boot.h
@@ -3,7 +3,7 @@
#ifndef __ASM_BOOT_H
#define __ASM_BOOT_H
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/*
* arm64 requires the DTB to be 8 byte aligned and
--- a/arch/arm64/include/asm/memory.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm64/include/asm/memory.h
@@ -26,7 +26,7 @@
#include <linux/types.h>
#include <asm/bug.h>
#include <asm/page-def.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/*
* Size of the PCI I/O space. This must remain a power of two so that
--- a/arch/arm64/mm/init.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm64/mm/init.c
@@ -48,7 +48,7 @@
#include <asm/numa.h>
#include <asm/sections.h>
#include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/tlb.h>
#include <asm/alternative.h>
--- a/arch/arm64/mm/mmu.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm64/mm/mmu.c
@@ -40,7 +40,7 @@
#include <asm/kernel-pgtable.h>
#include <asm/sections.h>
#include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/tlb.h>
#include <asm/mmu_context.h>
#include <asm/ptdump.h>
--- a/arch/arm/common/sa1111.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/common/sa1111.c
@@ -32,7 +32,7 @@
#include <mach/hardware.h>
#include <asm/mach/irq.h>
#include <asm/mach-types.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/hardware/sa1111.h>
--- a/arch/arm/mach-imx/devices/platform-fec.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-imx/devices/platform-fec.c
@@ -7,7 +7,7 @@
* Free Software Foundation.
*/
#include <linux/dma-mapping.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "../hardware.h"
#include "devices-common.h"
--- a/arch/arm/mach-imx/devices/platform-gpio_keys.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-imx/devices/platform-gpio_keys.c
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "../hardware.h"
#include "devices-common.h"
--- a/arch/arm/mach-imx/devices/platform-imx2-wdt.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-imx/devices/platform-imx2-wdt.c
@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation.
*/
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "../hardware.h"
#include "devices-common.h"
--- a/arch/arm/mach-imx/devices/platform-mxc_nand.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-imx/devices/platform-mxc_nand.c
@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation.
*/
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "../hardware.h"
#include "devices-common.h"
--- a/arch/arm/mach-imx/hardware.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-imx/hardware.h
@@ -24,7 +24,7 @@
#include <asm/io.h>
#include <soc/imx/revision.h>
#endif
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#define addr_in_module(addr, mod) \
((unsigned long)(addr) - mod ## _BASE_ADDR < mod ## _SIZE)
--- a/arch/arm/mach-integrator/impd1.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-integrator/impd1.c
@@ -27,7 +27,7 @@
#include <linux/irqchip/arm-vic.h>
#include <linux/gpio/machine.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "lm.h"
#include "impd1.h"
--- a/arch/arm/mach-iop13xx/pci.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-iop13xx/pci.c
@@ -24,7 +24,7 @@
#include <linux/export.h>
#include <asm/irq.h>
#include <mach/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/signal.h>
#include <asm/mach/pci.h>
#include "pci.h"
--- a/arch/arm/mach-iop13xx/tpmi.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-iop13xx/tpmi.c
@@ -23,7 +23,7 @@
#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/irqs.h>
/* assumes CONTROLLER_ONLY# is never asserted in the ESSR register */
--- a/arch/arm/mach-ixp4xx/common-pci.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-ixp4xx/common-pci.c
@@ -31,7 +31,7 @@
#include <asm/cputype.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/pci.h>
#include <mach/hardware.h>
--- a/arch/arm/mach-ks8695/include/mach/hardware.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-ks8695/include/mach/hardware.h
@@ -14,7 +14,7 @@
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/*
* Clocks are derived from MCLK, which is 25MHz
--- a/arch/arm/mach-omap1/include/mach/hardware.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-omap1/include/mach/hardware.h
@@ -36,7 +36,7 @@
#ifndef __ASM_ARCH_OMAP_HARDWARE_H
#define __ASM_ARCH_OMAP_HARDWARE_H
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <mach/soc.h>
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
@@ -11,7 +11,7 @@
* XXX handle crossbar/shared link difference for L3?
* XXX these should be marked initdata for multi-OMAP kernels
*/
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "omap_hwmod.h"
#include "l3_2xxx.h"
--- a/arch/arm/mach-prima2/common.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-prima2/common.c
@@ -8,7 +8,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <linux/of.h>
--- a/arch/arm/mach-pxa/balloon3.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/balloon3.c
@@ -35,7 +35,7 @@
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- a/arch/arm/mach-pxa/colibri-pxa270.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/colibri-pxa270.c
@@ -24,7 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach-types.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/audio.h>
#include "colibri.h"
--- a/arch/arm/mach-pxa/colibri-pxa300.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/colibri-pxa300.c
@@ -18,7 +18,7 @@
#include <linux/interrupt.h>
#include <asm/mach-types.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
--- a/arch/arm/mach-pxa/colibri-pxa320.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/colibri-pxa320.c
@@ -19,7 +19,7 @@
#include <linux/usb/gpio_vbus.h>
#include <asm/mach-types.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
--- a/arch/arm/mach-pxa/colibri-pxa3xx.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/colibri-pxa3xx.c
@@ -17,7 +17,7 @@
#include <linux/etherdevice.h>
#include <asm/mach-types.h>
#include <mach/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/system_info.h>
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
--- a/arch/arm/mach-pxa/gumstix.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/gumstix.c
@@ -33,7 +33,7 @@
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- a/arch/arm/mach-pxa/lpd270.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/lpd270.c
@@ -33,7 +33,7 @@
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- a/arch/arm/mach-pxa/lubbock.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/lubbock.c
@@ -39,7 +39,7 @@
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- a/arch/arm/mach-pxa/mainstone.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/mainstone.c
@@ -40,7 +40,7 @@
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- a/arch/arm/mach-pxa/trizeps4.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/trizeps4.c
@@ -35,7 +35,7 @@
#include <asm/memory.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
--- a/arch/arm/mach-pxa/viper.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-pxa/viper.c
@@ -58,7 +58,7 @@
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/system_info.h>
#include <asm/mach/arch.h>
--- a/arch/arm/mach-s3c24xx/include/mach/hardware.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-s3c24xx/include/mach/hardware.h
@@ -15,7 +15,7 @@ extern unsigned int s3c2410_modify_miscc
#endif /* __ASSEMBLY__ */
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/map.h>
#endif /* __ASM_ARCH_HARDWARE_H */
--- a/arch/arm/mach-sa1100/include/mach/memory.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-sa1100/include/mach/memory.h
@@ -8,7 +8,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/*
* Because of the wide memory address space between physical RAM banks on the
--- a/arch/arm/mach-sa1100/neponset.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-sa1100/neponset.c
@@ -21,7 +21,7 @@
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/hardware/sa1111.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/hardware.h>
#include <mach/assabet.h>
--- a/arch/arm/mach-tegra/iomap.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-tegra/iomap.h
@@ -20,7 +20,7 @@
#define __MACH_TEGRA_IOMAP_H
#include <asm/pgtable.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#define TEGRA_IRAM_BASE 0x40000000
#define TEGRA_IRAM_SIZE SZ_256K
--- a/arch/arm/mach-tegra/irammap.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-tegra/irammap.h
@@ -17,7 +17,7 @@
#ifndef __MACH_TEGRA_IRAMMAP_H
#define __MACH_TEGRA_IRAMMAP_H
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/* The first 1K of IRAM is permanently reserved for the CPU reset handler */
#define TEGRA_IRAM_RESET_HANDLER_OFFSET 0
--- a/arch/arm/mach-w90x900/include/mach/hardware.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/arm/mach-w90x900/include/mach/hardware.h
@@ -18,7 +18,7 @@
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/map.h>
#endif /* __ASM_ARCH_HARDWARE_H */
--- a/arch/nds32/include/asm/pgtable.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/nds32/include/asm/pgtable.h
@@ -6,7 +6,7 @@
#define __PAGETABLE_PMD_FOLDED 1
#include <asm-generic/4level-fixup.h>
-#include <asm-generic/sizes.h>
+#include <linux/sizes.h>
#include <asm/memory.h>
#include <asm/nds32.h>
--- a/arch/nds32/kernel/head.S~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/nds32/kernel/head.S
@@ -7,7 +7,7 @@
#include <asm/asm-offsets.h>
#include <asm/page.h>
#include <asm/pgtable.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/thread_info.h>
#ifdef CONFIG_CPU_BIG_ENDIAN
--- a/arch/sh/boards/board-apsh4a3a.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/board-apsh4a3a.c
@@ -16,7 +16,7 @@
#include <linux/irq.h>
#include <linux/clk.h>
#include <asm/machvec.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/clock.h>
static struct mtd_partition nor_flash_partitions[] = {
--- a/arch/sh/boards/board-apsh4ad0a.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/board-apsh4ad0a.c
@@ -15,7 +15,7 @@
#include <linux/irq.h>
#include <linux/clk.h>
#include <asm/machvec.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/* Dummy supplies, where voltage doesn't matter */
static struct regulator_consumer_supply dummy_supplies[] = {
--- a/arch/sh/boards/board-edosk7705.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/board-edosk7705.c
@@ -16,7 +16,7 @@
#include <linux/smc91x.h>
#include <linux/sh_intc.h>
#include <asm/machvec.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#define SMC_IOBASE 0xA2000000
#define SMC_IO_OFFSET 0x300
--- a/arch/sh/boards/board-edosk7760.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/board-edosk7760.c
@@ -18,7 +18,7 @@
#include <asm/addrspace.h>
#include <asm/delay.h>
#include <asm/i2c-sh7760.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/* Bus state controller registers for CS4 area */
#define BSC_CS4BCR 0xA4FD0010
--- a/arch/sh/boards/board-espt.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/board-espt.c
@@ -13,7 +13,7 @@
#include <linux/sh_eth.h>
#include <linux/sh_intc.h>
#include <asm/machvec.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
/* NOR Flash */
static struct mtd_partition espt_nor_flash_partitions[] = {
--- a/arch/sh/boards/board-urquell.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/board-urquell.c
@@ -21,7 +21,7 @@
#include <mach/urquell.h>
#include <cpu/sh7786.h>
#include <asm/heartbeat.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/smp-ops.h>
/*
--- a/arch/sh/boards/mach-microdev/setup.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/mach-microdev/setup.c
@@ -15,7 +15,7 @@
#include <mach/microdev.h>
#include <asm/io.h>
#include <asm/machvec.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
static struct resource smc91x_resources[] = {
[0] = {
--- a/arch/sh/boards/mach-sdk7786/fpga.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/mach-sdk7786/fpga.c
@@ -8,7 +8,7 @@
#include <linux/io.h>
#include <linux/bcd.h>
#include <mach/fpga.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#define FPGA_REGS_OFFSET 0x03fff800
#define FPGA_REGS_SIZE 0x490
--- a/arch/sh/boards/mach-sdk7786/setup.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/mach-sdk7786/setup.c
@@ -19,7 +19,7 @@
#include <mach/irq.h>
#include <asm/machvec.h>
#include <asm/heartbeat.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/clock.h>
#include <asm/reboot.h>
#include <asm/smp-ops.h>
--- a/arch/sh/boards/mach-sdk7786/sram.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/mach-sdk7786/sram.c
@@ -13,7 +13,7 @@
#include <linux/string.h>
#include <mach/fpga.h>
#include <asm/sram.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
static int __init fpga_sram_init(void)
{
--- a/arch/sh/boards/mach-se/7343/irq.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/mach-se/7343/irq.c
@@ -16,7 +16,7 @@
#include <linux/interrupt.h>
#include <linux/irqdomain.h>
#include <linux/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach-se/mach/se7343.h>
#define PA_CPLD_BASE_ADDR 0x11400000
--- a/arch/sh/boards/mach-se/7722/irq.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/boards/mach-se/7722/irq.c
@@ -14,7 +14,7 @@
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/err.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach-se/mach/se7722.h>
#define IRQ01_BASE_ADDR 0x11800000
--- a/arch/sh/drivers/pci/pcie-sh7786.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/drivers/pci/pcie-sh7786.c
@@ -18,7 +18,7 @@
#include <linux/sh_intc.h>
#include <cpu/sh7786.h>
#include "pcie-sh7786.h"
-#include <asm/sizes.h>
+#include <linux/sizes.h>
struct sh7786_pcie_port {
struct pci_channel *hose;
--- a/arch/sh/drivers/pci/pci-sh7751.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/drivers/pci/pci-sh7751.c
@@ -14,7 +14,7 @@
#include <linux/io.h>
#include "pci-sh4.h"
#include <asm/addrspace.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
static int __init __area_sdram_check(struct pci_channel *chan,
unsigned int area)
--- a/arch/sh/drivers/pci/pci-sh7780.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/drivers/pci/pci-sh7780.c
@@ -16,7 +16,7 @@
#include <linux/log2.h>
#include "pci-sh4.h"
#include <asm/mmu.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#if defined(CONFIG_CPU_BIG_ENDIAN)
# define PCICR_ENDIANNESS SH4_PCICR_BSWP
--- a/arch/sh/mm/init.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/mm/init.c
@@ -26,7 +26,7 @@
#include <asm/sections.h>
#include <asm/setup.h>
#include <asm/cache.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
pgd_t swapper_pg_dir[PTRS_PER_PGD];
--- a/arch/sh/mm/pmb.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/mm/pmb.c
@@ -24,7 +24,7 @@
#include <linux/spinlock.h>
#include <linux/vmalloc.h>
#include <asm/cacheflush.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/page.h>
--- a/arch/sh/mm/uncached.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/sh/mm/uncached.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/init.h>
#include <linux/module.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/page.h>
#include <asm/addrspace.h>
--- a/arch/unicore32/include/asm/memory.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/unicore32/include/asm/memory.h
@@ -16,7 +16,7 @@
#include <linux/compiler.h>
#include <linux/const.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/memory.h>
/*
--- a/arch/unicore32/mm/init.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/unicore32/mm/init.c
@@ -23,7 +23,7 @@
#include <asm/sections.h>
#include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/tlb.h>
#include <asm/memblock.h>
#include <mach/map.h>
--- a/arch/unicore32/mm/ioremap.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/unicore32/mm/ioremap.c
@@ -34,7 +34,7 @@
#include <asm/mmu_context.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/map.h>
#include "mm.h"
--- a/arch/unicore32/mm/mmu.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/unicore32/mm/mmu.c
@@ -22,7 +22,7 @@
#include <asm/cputype.h>
#include <asm/sections.h>
#include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/tlb.h>
#include <asm/memblock.h>
--- a/arch/x86/events/intel/bts.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/arch/x86/events/intel/bts.c
@@ -23,7 +23,7 @@
#include <linux/device.h>
#include <linux/coredump.h>
-#include <asm-generic/sizes.h>
+#include <linux/sizes.h>
#include <asm/perf_event.h>
#include "../perf_event.h"
--- a/drivers/gpu/drm/msm/msm_drv.h~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/gpu/drm/msm/msm_drv.h
@@ -33,7 +33,7 @@
#include <linux/types.h>
#include <linux/of_graph.h>
#include <linux/of_device.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <linux/kthread.h>
#include <drm/drmP.h>
--- a/drivers/iommu/msm_iommu.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/iommu/msm_iommu.c
@@ -34,7 +34,7 @@
#include <linux/of_iommu.h>
#include <asm/cacheflush.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "msm_iommu_hw-8xxx.h"
#include "msm_iommu.h"
--- a/drivers/mmc/host/mvsdio.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/mmc/host/mvsdio.c
@@ -24,7 +24,7 @@
#include <linux/mmc/host.h>
#include <linux/mmc/slot-gpio.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/unaligned.h>
#include "mvsdio.h"
--- a/drivers/mmc/host/pxamci.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/mmc/host/pxamci.c
@@ -35,7 +35,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/hardware.h>
#include <linux/platform_data/mmc-pxamci.h>
--- a/drivers/mtd/maps/sa1100-flash.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/mtd/maps/sa1100-flash.c
@@ -20,7 +20,7 @@
#include <linux/mtd/concat.h>
#include <mach/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/mach/flash.h>
struct sa_subdev_info {
--- a/drivers/pcmcia/omap_cf.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/pcmcia/omap_cf.c
@@ -22,7 +22,7 @@
#include <mach/hardware.h>
#include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <mach/mux.h>
#include <mach/tc.h>
--- a/drivers/sh/intc/userimask.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/sh/intc/userimask.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/stat.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include "internals.h"
static void __iomem *uimask;
--- a/drivers/video/fbdev/fb-puv3.c~treewide-replace-include-asm-sizesh-with-include-linux-sizesh
+++ a/drivers/video/fbdev/fb-puv3.c
@@ -20,7 +20,7 @@
#include <linux/console.h>
#include <linux/mm.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#include <asm/pgtable.h>
#include <mach/hardware.h>
_
Patches currently in -mm which might be from yamada.masahiro@xxxxxxxxxxxxx are
