The patch titled
delay: s/#include <asm/delay.h>/#include <linux/delay.h>/
has been added to the -mm tree. Its filename is
delay-s-include-asm-delayh-include-linux-delayh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: delay: s/#include <asm/delay.h>/#include <linux/delay.h>/
From: Denis Vlasenko <vda.linux@xxxxxxxxxxxxxx>
A few arch files won't see the definition of udelay() in asm/delay.h anymore.
Prevent that from biting us later.
Signed-off-by: Denis Vlasenko <vda.linux@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/kernel/core_t2.c | 2 +-
arch/arm/mach-integrator/platsmp.c | 2 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/plat-omap/mcbsp.c | 2 +-
arch/cris/arch-v10/drivers/i2c.c | 2 +-
arch/cris/arch-v32/drivers/i2c.c | 2 +-
arch/cris/arch-v32/kernel/smp.c | 2 +-
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +-
arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 2 +-
arch/i386/kernel/i8259.c | 2 +-
arch/i386/kernel/reboot_fixups.c | 2 +-
arch/i386/lib/delay.c | 1 -
arch/ia64/kernel/mca.c | 2 +-
arch/ia64/kernel/smpboot.c | 2 +-
arch/mips/galileo-boards/ev96100/setup.c | 2 +-
arch/mips/pci/ops-gt96100.c | 2 +-
arch/parisc/kernel/smp.c | 2 +-
arch/powerpc/kernel/rtas.c | 1 -
arch/powerpc/kernel/rtas_flash.c | 2 +-
arch/ppc/platforms/mpc885ads_setup.c | 2 +-
arch/ppc/syslib/mpc52xx_pci.c | 2 +-
arch/ppc/syslib/mv64x60_dbg.c | 2 +-
arch/ppc/syslib/ppc83xx_setup.c | 2 +-
arch/sparc/kernel/process.c | 2 +-
arch/sparc/kernel/sun4d_smp.c | 2 +-
arch/sparc/kernel/sun4m_smp.c | 2 +-
arch/x86_64/kernel/i8259.c | 2 +-
arch/x86_64/kernel/reboot.c | 2 +-
arch/x86_64/lib/delay.c | 2 +-
29 files changed, 27 insertions(+), 29 deletions(-)
diff -puN arch/alpha/kernel/core_t2.c~delay-s-include-asm-delayh-include-linux-delayh arch/alpha/kernel/core_t2.c
--- a/arch/alpha/kernel/core_t2.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/alpha/kernel/core_t2.c
@@ -18,9 +18,9 @@
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include <asm/ptrace.h>
-#include <asm/delay.h>
#include "proto.h"
#include "pci_impl.h"
diff -puN arch/arm/mach-integrator/platsmp.c~delay-s-include-asm-delayh-include-linux-delayh arch/arm/mach-integrator/platsmp.c
--- a/arch/arm/mach-integrator/platsmp.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/arm/mach-integrator/platsmp.c
@@ -13,10 +13,10 @@
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/mm.h>
+#include <linux/delay.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
-#include <asm/delay.h>
#include <asm/mmu_context.h>
#include <asm/procinfo.h>
#include <asm/ptrace.h>
diff -puN arch/arm/mach-omap2/board-h4.c~delay-s-include-asm-delayh-include-linux-delayh arch/arm/mach-omap2/board-h4.c
--- a/arch/arm/mach-omap2/board-h4.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/arm/mach-omap2/board-h4.c
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/workqueue.h>
#include <linux/input.h>
+#include <linux/delay.h>
#include <asm/hardware.h>
#include <asm/mach-types.h>
@@ -39,7 +40,6 @@
#include "prcm-regs.h"
#include <asm/io.h>
-#include <asm/delay.h>
static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 };
static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 };
diff -puN arch/arm/plat-omap/mcbsp.c~delay-s-include-asm-delayh-include-linux-delayh arch/arm/plat-omap/mcbsp.c
--- a/arch/arm/plat-omap/mcbsp.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/arm/plat-omap/mcbsp.c
@@ -20,8 +20,8 @@
#include <linux/interrupt.h>
#include <linux/err.h>
#include <linux/clk.h>
+#include <linux/delay.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include <asm/irq.h>
diff -puN arch/cris/arch-v10/drivers/i2c.c~delay-s-include-asm-delayh-include-linux-delayh arch/cris/arch-v10/drivers/i2c.c
--- a/arch/cris/arch-v10/drivers/i2c.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/cris/arch-v10/drivers/i2c.c
@@ -96,13 +96,13 @@
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include <asm/etraxi2c.h>
#include <asm/system.h>
#include <asm/arch/svinto.h>
#include <asm/io.h>
-#include <asm/delay.h>
#include <asm/arch/io_interface_mux.h>
#include "i2c.h"
diff -puN arch/cris/arch-v32/drivers/i2c.c~delay-s-include-asm-delayh-include-linux-delayh arch/cris/arch-v32/drivers/i2c.c
--- a/arch/cris/arch-v32/drivers/i2c.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/cris/arch-v32/drivers/i2c.c
@@ -33,12 +33,12 @@
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include <asm/etraxi2c.h>
#include <asm/system.h>
#include <asm/io.h>
-#include <asm/delay.h>
#include "i2c.h"
diff -puN arch/cris/arch-v32/kernel/smp.c~delay-s-include-asm-delayh-include-linux-delayh arch/cris/arch-v32/kernel/smp.c
--- a/arch/cris/arch-v32/kernel/smp.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/cris/arch-v32/kernel/smp.c
@@ -1,4 +1,3 @@
-#include <asm/delay.h>
#include <asm/arch/irq.h>
#include <asm/arch/hwregs/intr_vect.h>
#include <asm/arch/hwregs/intr_vect_defs.h>
@@ -8,6 +7,7 @@
#include <asm/arch/hwregs/supp_reg.h>
#include <asm/atomic.h>
+#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/timex.h>
diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~delay-s-include-asm-delayh-include-linux-delayh arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -33,8 +33,8 @@
#include <linux/compiler.h>
#include <linux/sched.h> /* current */
#include <linux/dmi.h>
+#include <linux/delay.h>
#include <asm/io.h>
-#include <asm/delay.h>
#include <asm/uaccess.h>
#include <linux/acpi.h>
diff -puN arch/i386/kernel/cpu/cpufreq/powernow-k8.c~delay-s-include-asm-delayh-include-linux-delayh arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -33,10 +33,10 @@
#include <linux/string.h>
#include <linux/cpumask.h>
#include <linux/sched.h> /* for current / set_cpus_allowed() */
+#include <linux/delay.h>
#include <asm/msr.h>
#include <asm/io.h>
-#include <asm/delay.h>
#ifdef CONFIG_X86_POWERNOW_K8_ACPI
#include <linux/acpi.h>
diff -puN arch/i386/kernel/i8259.c~delay-s-include-asm-delayh-include-linux-delayh arch/i386/kernel/i8259.c
--- a/arch/i386/kernel/i8259.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/i386/kernel/i8259.c
@@ -10,6 +10,7 @@
#include <linux/kernel_stat.h>
#include <linux/sysdev.h>
#include <linux/bitops.h>
+#include <linux/delay.h>
#include <asm/8253pit.h>
#include <asm/atomic.h>
@@ -17,7 +18,6 @@
#include <asm/io.h>
#include <asm/timer.h>
#include <asm/pgtable.h>
-#include <asm/delay.h>
#include <asm/desc.h>
#include <asm/apic.h>
#include <asm/arch_hooks.h>
diff -puN arch/i386/kernel/reboot_fixups.c~delay-s-include-asm-delayh-include-linux-delayh arch/i386/kernel/reboot_fixups.c
--- a/arch/i386/kernel/reboot_fixups.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/i386/kernel/reboot_fixups.c
@@ -8,7 +8,7 @@
*
*/
-#include <asm/delay.h>
+#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/reboot_fixups.h>
diff -puN arch/i386/lib/delay.c~delay-s-include-asm-delayh-include-linux-delayh arch/i386/lib/delay.c
--- a/arch/i386/lib/delay.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/i386/lib/delay.c
@@ -16,7 +16,6 @@
#include <linux/delay.h>
#include <asm/processor.h>
-#include <asm/delay.h>
#include <asm/timer.h>
#ifdef CONFIG_SMP
diff -puN arch/ia64/kernel/mca.c~delay-s-include-asm-delayh-include-linux-delayh arch/ia64/kernel/mca.c
--- a/arch/ia64/kernel/mca.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/ia64/kernel/mca.c
@@ -69,8 +69,8 @@
#include <linux/smp.h>
#include <linux/workqueue.h>
#include <linux/cpumask.h>
+#include <linux/delay.h>
-#include <asm/delay.h>
#include <asm/kdebug.h>
#include <asm/machvec.h>
#include <asm/meminit.h>
diff -puN arch/ia64/kernel/smpboot.c~delay-s-include-asm-delayh-include-linux-delayh arch/ia64/kernel/smpboot.c
--- a/arch/ia64/kernel/smpboot.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/ia64/kernel/smpboot.c
@@ -40,11 +40,11 @@
#include <linux/efi.h>
#include <linux/percpu.h>
#include <linux/bitops.h>
+#include <linux/delay.h>
#include <asm/atomic.h>
#include <asm/cache.h>
#include <asm/current.h>
-#include <asm/delay.h>
#include <asm/ia32.h>
#include <asm/io.h>
#include <asm/irq.h>
diff -puN arch/mips/galileo-boards/ev96100/setup.c~delay-s-include-asm-delayh-include-linux-delayh arch/mips/galileo-boards/ev96100/setup.c
--- a/arch/mips/galileo-boards/ev96100/setup.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/mips/galileo-boards/ev96100/setup.c
@@ -38,12 +38,12 @@
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/pci.h>
+#include <linux/delay.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/mipsregs.h>
#include <asm/irq.h>
-#include <asm/delay.h>
#include <asm/gt64120.h>
#include <asm/galileo-boards/ev96100int.h>
diff -puN arch/mips/pci/ops-gt96100.c~delay-s-include-asm-delayh-include-linux-delayh arch/mips/pci/ops-gt96100.c
--- a/arch/mips/pci/ops-gt96100.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/mips/pci/ops-gt96100.c
@@ -37,8 +37,8 @@
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/delay.h>
-#include <asm/delay.h>
#include <asm/gt64120.h>
#include <asm/galileo-boards/ev96100.h>
diff -puN arch/parisc/kernel/smp.c~delay-s-include-asm-delayh-include-linux-delayh arch/parisc/kernel/smp.c
--- a/arch/parisc/kernel/smp.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/parisc/kernel/smp.c
@@ -33,11 +33,11 @@
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/bitops.h>
+#include <linux/delay.h>
#include <asm/system.h>
#include <asm/atomic.h>
#include <asm/current.h>
-#include <asm/delay.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
diff -puN arch/powerpc/kernel/rtas.c~delay-s-include-asm-delayh-include-linux-delayh arch/powerpc/kernel/rtas.c
--- a/arch/powerpc/kernel/rtas.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/powerpc/kernel/rtas.c
@@ -29,7 +29,6 @@
#include <asm/page.h>
#include <asm/param.h>
#include <asm/system.h>
-#include <asm/delay.h>
#include <asm/uaccess.h>
#include <asm/lmb.h>
#include <asm/udbg.h>
diff -puN arch/powerpc/kernel/rtas_flash.c~delay-s-include-asm-delayh-include-linux-delayh arch/powerpc/kernel/rtas_flash.c
--- a/arch/powerpc/kernel/rtas_flash.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/powerpc/kernel/rtas_flash.c
@@ -16,7 +16,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
#include <asm/uaccess.h>
#include <asm/rtas.h>
#include <asm/abs_addr.h>
diff -puN arch/ppc/platforms/mpc885ads_setup.c~delay-s-include-asm-delayh-include-linux-delayh arch/ppc/platforms/mpc885ads_setup.c
--- a/arch/ppc/platforms/mpc885ads_setup.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/ppc/platforms/mpc885ads_setup.c
@@ -17,12 +17,12 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/device.h>
+#include <linux/delay.h>
#include <linux/fs_enet_pd.h>
#include <linux/fs_uart_pd.h>
#include <linux/mii.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/page.h>
diff -puN arch/ppc/syslib/mpc52xx_pci.c~delay-s-include-asm-delayh-include-linux-delayh arch/ppc/syslib/mpc52xx_pci.c
--- a/arch/ppc/syslib/mpc52xx_pci.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/ppc/syslib/mpc52xx_pci.c
@@ -11,13 +11,13 @@
* kind, whether express or implied.
*/
+#include <linux/delay.h>
#include <asm/pci.h>
#include <asm/mpc52xx.h>
#include "mpc52xx_pci.h"
-#include <asm/delay.h>
#include <asm/machdep.h>
diff -puN arch/ppc/syslib/mv64x60_dbg.c~delay-s-include-asm-delayh-include-linux-delayh arch/ppc/syslib/mv64x60_dbg.c
--- a/arch/ppc/syslib/mv64x60_dbg.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/ppc/syslib/mv64x60_dbg.c
@@ -19,7 +19,7 @@
#include <linux/irq.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
#include <asm/mv64x60.h>
#include <asm/machdep.h>
diff -puN arch/ppc/syslib/ppc83xx_setup.c~delay-s-include-asm-delayh-include-linux-delayh arch/ppc/syslib/ppc83xx_setup.c
--- a/arch/ppc/syslib/ppc83xx_setup.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/ppc/syslib/ppc83xx_setup.c
@@ -30,13 +30,13 @@
#include <linux/tty.h> /* for linux/serial_core.h */
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
+#include <linux/delay.h>
#include <asm/time.h>
#include <asm/mpc83xx.h>
#include <asm/mmu.h>
#include <asm/ppc_sys.h>
#include <asm/kgdb.h>
-#include <asm/delay.h>
#include <asm/machdep.h>
#include <syslib/ppc83xx_setup.h>
diff -puN arch/sparc/kernel/process.c~delay-s-include-asm-delayh-include-linux-delayh arch/sparc/kernel/process.c
--- a/arch/sparc/kernel/process.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/sparc/kernel/process.c
@@ -28,6 +28,7 @@
#include <linux/delay.h>
#include <linux/pm.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include <asm/auxio.h>
#include <asm/oplib.h>
@@ -36,7 +37,6 @@
#include <asm/page.h>
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
-#include <asm/delay.h>
#include <asm/processor.h>
#include <asm/psr.h>
#include <asm/elf.h>
diff -puN arch/sparc/kernel/sun4d_smp.c~delay-s-include-asm-delayh-include-linux-delayh arch/sparc/kernel/sun4d_smp.c
--- a/arch/sparc/kernel/sun4d_smp.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/sparc/kernel/sun4d_smp.c
@@ -20,11 +20,11 @@
#include <linux/mm.h>
#include <linux/swap.h>
#include <linux/profile.h>
+#include <linux/delay.h>
#include <asm/ptrace.h>
#include <asm/atomic.h>
-#include <asm/delay.h>
#include <asm/irq.h>
#include <asm/page.h>
#include <asm/pgalloc.h>
diff -puN arch/sparc/kernel/sun4m_smp.c~delay-s-include-asm-delayh-include-linux-delayh arch/sparc/kernel/sun4m_smp.c
--- a/arch/sparc/kernel/sun4m_smp.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/sparc/kernel/sun4m_smp.c
@@ -17,13 +17,13 @@
#include <linux/mm.h>
#include <linux/swap.h>
#include <linux/profile.h>
+#include <linux/delay.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/ptrace.h>
#include <asm/atomic.h>
-#include <asm/delay.h>
#include <asm/irq.h>
#include <asm/page.h>
#include <asm/pgalloc.h>
diff -puN arch/x86_64/kernel/i8259.c~delay-s-include-asm-delayh-include-linux-delayh arch/x86_64/kernel/i8259.c
--- a/arch/x86_64/kernel/i8259.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/x86_64/kernel/i8259.c
@@ -12,6 +12,7 @@
#include <linux/kernel_stat.h>
#include <linux/sysdev.h>
#include <linux/bitops.h>
+#include <linux/delay.h>
#include <asm/acpi.h>
#include <asm/atomic.h>
@@ -19,7 +20,6 @@
#include <asm/io.h>
#include <asm/hw_irq.h>
#include <asm/pgtable.h>
-#include <asm/delay.h>
#include <asm/desc.h>
#include <asm/apic.h>
diff -puN arch/x86_64/kernel/reboot.c~delay-s-include-asm-delayh-include-linux-delayh arch/x86_64/kernel/reboot.c
--- a/arch/x86_64/kernel/reboot.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/x86_64/kernel/reboot.c
@@ -7,9 +7,9 @@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/pm.h>
+#include <linux/delay.h>
#include <asm/io.h>
#include <asm/kdebug.h>
-#include <asm/delay.h>
#include <asm/hw_irq.h>
#include <asm/system.h>
#include <asm/pgtable.h>
diff -puN arch/x86_64/lib/delay.c~delay-s-include-asm-delayh-include-linux-delayh arch/x86_64/lib/delay.c
--- a/arch/x86_64/lib/delay.c~delay-s-include-asm-delayh-include-linux-delayh
+++ a/arch/x86_64/lib/delay.c
@@ -12,7 +12,7 @@
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/delay.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
#include <asm/msr.h>
#ifdef CONFIG_SMP
_
Patches currently in -mm which might be from vda.linux@xxxxxxxxxxxxxx are
git-drm.patch
aic7xxx-fix-byte-i-o-order-in-ahd_inw.patch
delay-s-include-asm-delayh-include-linux-delayh.patch
delay-remove-references-to-max_udelay_ms-fix-comment.patch
delay-add-generic-udelay-mdelay-and-ssleep.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
