asm/ vs linux/delay.h (was: Re: 2.4.0)
A message that is not in the archive (sent off-list or not yet received): [email protected]
On Sat, 6 Jan 2001, Christian T. Steigies wrote:
[ Compiling on m68k ]
Quoted 4 lines
How about this one, 2.4.0 (release) with your new patch. make works fine, make modules fails with this:
In file included from emd.c:20:
/build/kernel-image/2.4.0/linux/include/asm/delay.h: In function `__const_udelay':
Quoted 8 lines
/build/kernel-image/2.4.0/linux/include/asm/delay.h:33: `loops_per_jiffy' undeclared (first use in this function) /build/kernel-image/2.4.0/linux/include/asm/delay.h:33: (Each undeclared identifier is reported only once /build/kernel-image/2.4.0/linux/include/asm/delay.h:33: for each function it appears in.) make[2]: *** [emd.o] Error 1
make[2]: Leaving directory `/build/kernel-image/2.4.0/linux/fs/umsdos'
make[1]: *** [_modsubdir_umsdos] Error 2
make[1]: Leaving directory `/build/kernel-image/2.4.0/linux/fs'
make: *** [_mod_fs] Error 2
Drivers should include <linux/delay.h>, not <asm/delay.h>.
Please try the patch below. I only tried to compile fs/umsdos/emd.c for m68k. I didn't dare to touch the following arch-specific files:
arch/i386/lib/delay.c
arch/i386/kernel/i8259.c
arch/i386/kernel/irq.c
arch/i386/kernel/time.c
arch/i386/kernel/i386_ksyms.c
arch/i386/kernel/visws_apic.c
arch/sparc/kernel/process.c
arch/sparc/kernel/traps.c
arch/sparc/kernel/smp.c
arch/sparc/kernel/sun4d_smp.c
arch/sparc/kernel/sparc_ksyms.c
arch/sparc/kernel/sun4m_smp.c
arch/mips/jazz/reset.c
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/kernel/traps.c
arch/arm/mach-sa1100/hw.c
arch/sh/kernel/irq.c
arch/sh/kernel/sh_ksyms.c
arch/sh/kernel/time.c
arch/ia64/hp/hpsim_console.c
arch/ia64/hp/hpsim_setup.c
arch/ia64/kernel/irq.c
arch/ia64/kernel/irq_ia64.c
arch/ia64/kernel/process.c
arch/ia64/kernel/smp.c
arch/ia64/kernel/time.c
arch/ia64/kernel/unwind.c
arch/ia64/kernel/smpboot.c
arch/ia64/kernel/iosapic.c
arch/ia64/mm/tlb.c
arch/s390/kernel/irq.c
arch/s390/kernel/s390io.c
arch/s390/kernel/time.cdrivers/acpi/os.c +1 -1
@@ -24,8 +24,8 @@#include <linux/mm.h> #include <linux/pci.h> #include <linux/acpi.h> +#include <linux/delay.h> #include <asm/io.h> -#include <asm/delay.h> #include "acpi.h" #include "driver.h"
drivers/ide/osb4.c +1 -1
@@ -46,8 +46,8 @@#include <linux/hdreg.h> #include <linux/ide.h> #include <linux/init.h> +#include <linux/delay.h> -#include <asm/delay.h> #include <asm/io.h> #include "ide_modes.h"
drivers/net/winbond-840.c +1 -1
@@ -127,10 +127,10 @@#include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/init.h> +#include <linux/delay.h> #include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/bitops.h> #include <asm/io.h> -#include <asm/delay.h> MODULE_AUTHOR ("Donald Becker <[email protected]>" );MODULE_DESCRIPTION ("Winbond W89c840 Ethernet driver" );
drivers/sbus/audio/audio.c +1 -1
@@ -34,7 +34,7 @@#include <linux/soundcard.h> #include <linux/version.h> #include <linux/devfs_fs_kernel.h> -#include <asm/delay.h> +#include <linux/delay.h> #include <asm/pgtable.h> #include <asm/audioio.h>
drivers/sbus/audio/dbri.c +1 -1
@@ -49,12 +49,12 @@#include <linux/interrupt.h> #include <linux/malloc.h> #include <linux/version.h> +#include <linux/delay.h> #include <asm/openprom.h> #include <asm/oplib.h> #include <asm/system.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/delay.h> #include <asm/sbus.h> #include <asm/pgtable.h>
drivers/sbus/char/vfc_dev.c +1 -1
@@ -22,13 +22,13 @@#include <linux/sched.h> #include <linux/fs.h> #include <linux/smp_lock.h> +#include <linux/delay.h> #include <asm/openprom.h> #include <asm/oplib.h> #include <asm/io.h> #include <asm/system.h> #include <asm/sbus.h> -#include <asm/delay.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/uaccess.h>
drivers/sbus/dvma.c +1 -1
@@ -8,9 +8,9 @@#include <linux/kernel.h> #include <linux/malloc.h> #include <linux/init.h> +#include <linux/delay.h> #include <asm/oplib.h> -#include <asm/delay.h> #include <asm/io.h> #include <asm/dma.h> #include <asm/sbus.h>
drivers/sound/via82cxxx_audio.c +1 -1
@@ -34,8 +34,8 @@#include <linux/smp_lock.h> #include <linux/ioport.h> #include <linux/wrapper.h> +#include <linux/delay.h> #include <asm/io.h> -#include <asm/delay.h> #include <asm/uaccess.h> #include <asm/hardirq.h> #include <asm/semaphore.h>
drivers/video/fbcon-sti.c +1 -1
@@ -16,7 +16,7 @@#include <linux/console.h> #include <linux/string.h> #include <linux/fb.h> -#include <asm/delay.h> +#include <linux/delay.h> #include <asm/types.h> #include <video/fbcon.h>
fs/umsdos/emd.c +1 -2
@@ -16,8 +16,7 @@#include <linux/umsdos_fs.h> #include <linux/dcache.h> #include <linux/pagemap.h> - -#include <asm/delay.h> +#include <linux/delay.h> static void copy_entry (struct umsdos_dirent *p,struct umsdos_dirent *q) {
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/