fix sun_esp.c compile
PATCH 1/1 fix sun_esp.c compile
Fix a sparc32 compile problem in latest git.
drivers/scsi/sun_esp.c: In function 'sbus_esp_reset_dma':drivers/scsi/sun_esp.c:294: error: 'loops_per_jiffy' undeclared (first use in this function)drivers/scsi/sun_esp.c:294: error: (Each undeclared identifier is reported only oncedrivers/scsi/sun_esp.c:294: error: for each function it appears in.) drivers/scsi/sun_esp.c: In function 'sbus_esp_dma_drain':drivers/scsi/sun_esp.c:364: error: 'loops_per_jiffy' undeclared (first use in this function)drivers/scsi/sun_esp.c: In function 'sbus_esp_dma_invalidate':drivers/scsi/sun_esp.c:396: error: 'loops_per_jiffy' undeclared (first use in this function)
drivers/scsi/sun_esp.c +1 -0
@@ -7,6 +7,7 @@ #include <linux/kernel.h>#include <linux/types.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/delay.h> #include <asm/irq.h>
#include <asm/io.h>
From: Robert Reif <[email protected]>
Date: Sun, 06 May 2007 22:20:47 -0400
Quoted 15 lines
Fix a sparc32 compile problem in latest git.
drivers/scsi/sun_esp.c: In function 'sbus_esp_reset_dma':drivers/scsi/sun_esp.c:294: error: 'loops_per_jiffy' undeclared (first use in this function)drivers/scsi/sun_esp.c:294: error: (Each undeclared identifier is reported only oncedrivers/scsi/sun_esp.c:294: error: for each function it appears in.)drivers/scsi/sun_esp.c: In function 'sbus_esp_dma_drain':drivers/scsi/sun_esp.c:364: error: 'loops_per_jiffy' undeclared (first use in this function)drivers/scsi/sun_esp.c: In function 'sbus_esp_dma_invalidate':drivers/scsi/sun_esp.c:396: error: 'loops_per_jiffy' undeclared (first use in this function)
Quoted 1 line
Signed-off-by Robert Reif <[email protected]>
Thanks Robert, this is queued up in my sparc-2.6.git tree already.
I applied the esp patch plus the one from robert against 2.6.21, but still get a build error. No clue what this error means :(. Any cure?
sparc-linux-ld -m elf32_sparc -r -o .tmp_vmlinux1 -T arch/sparc/kernel/vmlinux.lds arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o init/built-in.o --start-group usr/built-in.o arch/sparc/kernel/built-in.o arch/sparc/mm/built-in.o arch/sparc/math-emu/built-in.o kernel/built-in.o mm/built-in.o fs/built-in.o ipc/built-in.o security/built-in.o crypto/built-in.o block/built-in.o lib/lib.a arch/sparc/prom/lib.a arch/sparc/lib/lib.a lib/built-in.o arch/sparc/prom/built-in.o arch/sparc/lib/built-in.o drivers/built-in.o sound/built-in.o net/built-in.o --end-groupscsi_esp_unregister: discarded in section `.exit.text' from drivers/built-in.o
make: *** [.tmp_vmlinux1] Error 1
Am using gcc 3.4.3. Config attached.
Thanks,
Martin
CONFIG_MMU=yCONFIG_HIGHMEM=yCONFIG_ZONE_DMA=yCONFIG_GENERIC_ISA_DMA=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_EXPERIMENTAL=yCONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="-mph3"CONFIG_SWAP=yCONFIG_SYSVIPC=yCONFIG_SYSVIPC_SYSCTL=yCONFIG_SYSCTL=yCONFIG_EMBEDDED=yCONFIG_UID16=yCONFIG_KALLSYMS=yCONFIG_PRINTK=yCONFIG_BUG=yCONFIG_ELF_CORE=yCONFIG_BASE_FULL=yCONFIG_FUTEX=yCONFIG_EPOLL=yCONFIG_SHMEM=yCONFIG_VM_EVENT_COUNTERS=yCONFIG_RT_MUTEXES=yCONFIG_BASE_SMALL=0CONFIG_SLOB=yCONFIG_MODULES=yCONFIG_MODULE_UNLOAD=yCONFIG_KMOD=yCONFIG_BLOCK=yCONFIG_IOSCHED_NOOP=yCONFIG_IOSCHED_DEADLINE=y CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline"CONFIG_SPARC=yCONFIG_SPARC32=yCONFIG_SBUS=yCONFIG_SBUSCHAR=yCONFIG_SERIAL_CONSOLE=yCONFIG_SUN_AUXIO=yCONFIG_SUN_IO=yCONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MAY_HAVE_PC_FDC=yCONFIG_SUN_PM=yCONFIG_SUN_OPENPROMFS=mCONFIG_SPARC_LED=mCONFIG_BINFMT_ELF=yCONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=yCONFIG_FLATMEM=yCONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPLIT_PTLOCK_CPUS=4CONFIG_ZONE_DMA_FLAG=1CONFIG_NET=yCONFIG_PACKET=yCONFIG_UNIX=yCONFIG_XFRM=yCONFIG_XFRM_USER=mCONFIG_NET_KEY=mCONFIG_INET=yCONFIG_IP_FIB_HASH=yCONFIG_INET_AH=mCONFIG_INET_ESP=mCONFIG_INET_IPCOMP=mCONFIG_INET_XFRM_TUNNEL=mCONFIG_INET_TUNNEL=mCONFIG_INET_DIAG=mCONFIG_INET_TCP_DIAG=mCONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_BLK_DEV_LOOP=mCONFIG_BLK_DEV_CRYPTOLOOP=mCONFIG_BLK_DEV_RAM=mCONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024CONFIG_SCSI=yCONFIG_SCSI_TGT=mCONFIG_SCSI_NETLINK=yCONFIG_SCSI_PROC_FS=yCONFIG_BLK_DEV_SD=yCONFIG_CHR_DEV_ST=mCONFIG_BLK_DEV_SR=mCONFIG_BLK_DEV_SR_VENDOR=yCONFIG_CHR_DEV_SG=mCONFIG_CHR_DEV_SCH=mCONFIG_SCSI_CONSTANTS=yCONFIG_SCSI_SPI_ATTRS=yCONFIG_SCSI_FC_ATTRS=mCONFIG_SCSI_ISCSI_ATTRS=mCONFIG_SCSI_SAS_ATTRS=mCONFIG_ISCSI_TCP=mCONFIG_SCSI_ESP_CORE=yCONFIG_SCSI_SUNESP=yCONFIG_NETDEVICES=yCONFIG_NET_ETHERNET=yCONFIG_MII=mCONFIG_SUNLANCE=mCONFIG_SERIO=yCONFIG_SERIO_SERPORT=mCONFIG_SERIO_RAW=mCONFIG_SERIAL_SUNCORE=yCONFIG_SERIAL_SUNZILOG=y CONFIG_SERIAL_SUNZILOG_CONSOLE=y CONFIG_SERIAL_CORE=yCONFIG_SERIAL_CORE_CONSOLE=yCONFIG_UNIX98_PTYS=yCONFIG_HW_RANDOM=mCONFIG_SOUND=mCONFIG_SND=mCONFIG_SND_TIMER=mCONFIG_SND_PCM=mCONFIG_SND_SUN_DBRI=mCONFIG_RTC_LIB=mCONFIG_RTC_CLASS=mCONFIG_RTC_INTF_SYSFS=mCONFIG_RTC_INTF_PROC=mCONFIG_RTC_INTF_DEV=mCONFIG_DMA_ENGINE=yCONFIG_NET_DMA=yCONFIG_SUN_OPENPROMIO=mCONFIG_SUN_MOSTEK_RTC=mCONFIG_UNIX98_PTY_COUNT=64CONFIG_EXT3_FS=yCONFIG_JBD=yCONFIG_MINIX_FS=mCONFIG_ISO9660_FS=mCONFIG_JOLIET=yCONFIG_ZISOFS=yCONFIG_FAT_FS=mCONFIG_MSDOS_FS=mCONFIG_VFAT_FS=mCONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_PROC_FS=yCONFIG_PROC_KCORE=yCONFIG_PROC_SYSCTL=yCONFIG_SYSFS=yCONFIG_TMPFS=yCONFIG_RAMFS=yCONFIG_CRAMFS=mCONFIG_UFS_FS=mCONFIG_NFS_FS=mCONFIG_NFS_V3=yCONFIG_LOCKD=mCONFIG_LOCKD_V4=yCONFIG_NFS_COMMON=yCONFIG_SUNRPC=mCONFIG_PARTITION_ADVANCED=y CONFIG_MSDOS_PARTITION=yCONFIG_BSD_DISKLABEL=yCONFIG_MINIX_SUBPARTITION=yCONFIG_SUN_PARTITION=yCONFIG_NLS=mCONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_850=m CONFIG_NLS_CODEPAGE_1250=mCONFIG_NLS_ASCII=mCONFIG_NLS_ISO8859_1=mCONFIG_NLS_ISO8859_2=mCONFIG_NLS_ISO8859_15=mCONFIG_NLS_UTF8=mCONFIG_PROFILING=yCONFIG_OPROFILE=mCONFIG_MAGIC_SYSRQ=yCONFIG_UNUSED_SYMBOLS=yCONFIG_DEBUG_KERNEL=yCONFIG_LOG_BUF_SHIFT=14CONFIG_DEBUG_BUGVERBOSE=yCONFIG_FORCED_INLINING=yCONFIG_CRYPTO=yCONFIG_CRYPTO_ALGAPI=yCONFIG_CRYPTO_BLKCIPHER=mCONFIG_CRYPTO_HASH=yCONFIG_CRYPTO_MANAGER=yCONFIG_CRYPTO_HMAC=yCONFIG_CRYPTO_NULL=mCONFIG_CRYPTO_MD4=mCONFIG_CRYPTO_MD5=mCONFIG_CRYPTO_SHA1=mCONFIG_CRYPTO_ECB=mCONFIG_CRYPTO_CBC=mCONFIG_CRYPTO_DES=mCONFIG_CRYPTO_DEFLATE=mCONFIG_CRYPTO_CRC32C=mCONFIG_BITREVERSE=mCONFIG_CRC_CCITT=mCONFIG_CRC32=mCONFIG_LIBCRC32C=mCONFIG_ZLIB_INFLATE=mCONFIG_ZLIB_DEFLATE=mCONFIG_PLIST=yCONFIG_HAS_IOMEM=yCONFIG_HAS_IOPORT=y