# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet v2.5.63 -> 1.1090 # drivers/media/video/saa7110.c 1.8 -> 1.9 # arch/m68knommu/platform/68360/ints.c 1.1 -> 1.2 # drivers/isdn/eicon/eicon_idi.c 1.9 -> 1.10 # arch/ppc/mm/mem_pieces.h 1.3 -> 1.4 # drivers/net/irda/irtty-sir.c 1.1 -> 1.2 # net/ipv4/netfilter/ip_conntrack_core.c 1.17 -> 1.18 # arch/m68knommu/kernel/syscalltable.S 1.3 -> 1.4 # arch/sparc64/lib/U3copy_to_user.S 1.2 -> 1.3 # drivers/net/sk98lin/ski2c.c 1.3 -> 1.4 # arch/mips64/math-emu/dp_div.c 1.1 -> 1.2 # drivers/scsi/megaraid.c 1.35 -> 1.37 # drivers/i2c/chips/lm75.c 1.5 -> 1.6 # include/asm-alpha/pci.h 1.10 -> 1.11 # drivers/scsi/aic7xxx/aic79xx_core.c 1.10 -> 1.12 # include/linux/acpi.h 1.22 -> 1.23 # include/asm-x86_64/semaphore.h 1.3 -> 1.4 # drivers/atm/horizon.c 1.8 -> 1.9 # drivers/scsi/sym53c8xx_2/sym_hipd.c 1.5 -> 1.6 # arch/sh/kernel/time.c 1.6 -> 1.7 # include/asm-ia64/sn/pci/pcibr_private.h 1.5 -> 1.6 # drivers/net/sk98lin/skgesirq.c 1.3 -> 1.4 # drivers/s390/block/dasd_eckd.c 1.15 -> 1.16 # sound/oss/opl3sa2.c 1.17 -> 1.18 # drivers/usb/media/konicawc.c 1.17 -> 1.20 # fs/xfs/linux/xfs_sysctl.h 1.4 -> 1.5 # sound/oss/trident.h 1.8 -> 1.9 # drivers/net/pcmcia/Makefile 1.14 -> 1.15 # drivers/scsi/ips.c 1.48 -> 1.50 # sound/oss/cs46xx.c 1.22 -> 1.23 # net/llc/af_llc.c 1.32 -> 1.33 # include/net/dn_dev.h 1.2 -> 1.3 # lib/crc32.c 1.9 -> 1.10 # arch/m68k/q40/README 1.3 -> 1.4 # arch/s390/kernel/time.c 1.11 -> 1.12 # drivers/net/3c501.c 1.15 -> 1.16 # arch/ppc/4xx_io/serial_sicc.c 1.3 -> 1.4 # arch/mips64/sgi-ip27/ip27-nmi.c 1.1 -> 1.2 # fs/befs/btree.c 1.3 -> 1.4 # include/asm-ppc64/page.h 1.17 -> 1.18 # drivers/ieee1394/raw1394.c 1.18 -> 1.19 # scripts/mkspec 1.3 -> 1.4 # drivers/net/sk98lin/h/skdrv1st.h 1.5 -> 1.6 # drivers/char/watchdog/i810-tco.c 1.14 -> 1.16 # include/net/sctp/user.h 1.5 -> 1.6 # include/asm-ppc/uaccess.h 1.6 -> 1.7 # lib/crc32defs.h 1.1 -> 1.2 # Documentation/networking/decnet.txt 1.4 -> 1.5 # drivers/i2c/chips/adm1021.c 1.5 -> 1.6 # include/asm-alpha/mman.h 1.3 -> 1.4 # drivers/net/wan/z85230.c 1.5 -> 1.6 # arch/mips64/kernel/r4k_switch.S 1.2 -> 1.3 # drivers/acpi/dispatcher/dsobject.c 1.23 -> 1.24 # include/linux/jiffies.h 1.6 -> 1.7 # arch/ia64/ia32/ia32_signal.c 1.14 -> 1.15 # drivers/s390/block/dasd_diag.c 1.10 -> 1.11 # fs/xfs/xfs_buf_item.c 1.7 -> 1.8 # include/asm-arm/bitops.h 1.9 -> 1.10 # arch/ppc/mm/mem_pieces.c 1.4 -> 1.5 # include/asm-mips/processor.h 1.8 -> 1.9 # drivers/net/sk98lin/skcsum.c 1.2 -> 1.3 # fs/xfs/pagebuf/page_buf.c 1.40 -> 1.44 # drivers/mtd/devices/blkmtd.c 1.25 -> 1.28 # drivers/net/3c509.c 1.31 -> 1.33 # drivers/scsi/oktagon_esp.c 1.9 -> 1.10 # arch/mips/math-emu/ieee754.c 1.1 -> 1.2 # drivers/parisc/dino.c 1.5 -> 1.6 # include/linux/mm.h 1.107 -> 1.108 # drivers/telephony/ixj.c 1.20 -> 1.21 # arch/ia64/sn/io/sn2/pcibr/pcibr_error.c 1.3 -> 1.4 # drivers/scsi/aha152x.c 1.22 -> 1.24 # arch/cris/kernel/signal.c 1.10 -> 1.11 # drivers/serial/8250.c 1.26 -> 1.29 # Documentation/DocBook/parportbook.tmpl 1.7 -> 1.8 # drivers/scsi/hosts.c 1.53 -> 1.54 # arch/i386/kernel/apm.c 1.46 -> 1.47 # drivers/net/dgrs.c 1.13 -> 1.14 # include/asm-parisc/pdc_chassis.h 1.1 -> 1.2 # arch/i386/mach-visws/visws_apic.c 1.6 -> 1.7 # drivers/scsi/cpqfcTSinit.c 1.31 -> 1.32 # drivers/net/sb1000.c 1.14 -> 1.15 # drivers/scsi/aacraid/comminit.c 1.1 -> 1.2 # arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c 1.2 -> 1.3 # drivers/net/pcmcia/aironet4500_cs.c 1.12 -> (deleted) # arch/i386/kernel/irq.c 1.25 -> 1.26 # net/sctp/sm_statefuns.c 1.31 -> 1.34 # arch/ppc/8xx_io/cs4218_tdm.c 1.4 -> 1.5 # drivers/scsi/scsi_proc.c 1.17 -> 1.18 # drivers/scsi/aic7xxx/aic7xxx_osm.c 1.19 -> 1.21 # drivers/isdn/hysdn/hycapi.c 1.15 -> 1.17 # Documentation/sound/oss/Wavefront 1.2 -> 1.3 # arch/mips/math-emu/dp_div.c 1.1 -> 1.2 # sound/pci/cs46xx/cs46xx_lib.c 1.24 -> 1.25 # drivers/isdn/hisax/hfc_sx.c 1.34 -> 1.36 # drivers/scsi/sun3_scsi.c 1.12 -> 1.13 # drivers/scsi/cpqfcTScontrol.c 1.7 -> 1.8 # drivers/acpi/events/evrgnini.c 1.15 -> 1.16 # include/asm-mips64/pci.h 1.6 -> 1.7 # arch/m68k/ifpsp060/src/pfpsp.S 1.5 -> 1.6 # drivers/video/pvr2fb.c 1.11 -> 1.12 # fs/jbd/revoke.c 1.11 -> 1.12 # drivers/net/fec.c 1.5 -> 1.6 # drivers/scsi/sun3_NCR5380.c 1.9 -> 1.11 # arch/mips64/mips-boards/generic/pci.c 1.2 -> 1.3 # kernel/fork.c 1.108 -> 1.110 # drivers/ide/ppc/pmac.c 1.7 -> 1.8 # drivers/net/skfp/hwt.c 1.1 -> 1.2 # fs/xfs/support/debug.c 1.9 -> 1.10 # arch/arm/kernel/ptrace.c 1.17 -> 1.18 # drivers/block/ll_rw_blk.c 1.153 -> 1.155 # kernel/sys.c 1.42 -> 1.43 # Makefile 1.380 -> 1.381 # drivers/net/wireless/airo.c 1.32 -> 1.35 # fs/ext2/xattr.h 1.4 -> 1.5 # drivers/video/macfb.c 1.24 -> 1.25 # fs/jffs2/compr_rtime.c 1.3 -> 1.4 # include/asm-i386/mach-visws/cobalt.h 1.3 -> 1.4 # drivers/net/8390.c 1.10 -> 1.12 # fs/befs/ChangeLog 1.4 -> 1.5 # drivers/acpi/hardware/hwtimer.c 1.14 -> 1.15 # include/linux/serial_core.h 1.14 -> 1.16 # drivers/isdn/tpam/tpam_commands.c 1.7 -> 1.8 # include/asm-cris/uaccess.h 1.4 -> 1.5 # include/asm-m68k/posix_types.h 1.1 -> 1.2 # drivers/s390/net/lcs.c 1.11 -> 1.12 # drivers/serial/amba.c 1.14.1.2 -> 1.16 # drivers/ieee1394/ohci1394.h 1.13 -> 1.14 # fs/ext3/xattr_user.c 1.6 -> 1.7 # arch/parisc/kernel/ptrace.c 1.8 -> 1.9 # fs/ext2/xattr_trusted.c 1.1 -> 1.2 # fs/dcache.c 1.39 -> 1.40 # drivers/atm/firestream.c 1.15 -> 1.16 # drivers/net/tlan.c 1.17 -> 1.19 # arch/cris/mm/tlb.c 1.5 -> 1.6 # arch/parisc/kernel/perf_images.h 1.1 -> 1.2 # fs/proc/proc_misc.c 1.66 -> 1.67 # drivers/serial/sa1100.c 1.15.1.1 -> 1.18 # drivers/media/dvb/av7110/saa7146.c 1.2 -> 1.3 # arch/mips/kernel/irq.c 1.7 -> 1.8 # include/net/iw_handler.h 1.4 -> 1.5 # include/asm-m68k/swim_iop.h 1.1 -> 1.2 # drivers/scsi/sym53c416.c 1.12 -> 1.14 # drivers/block/cpqarray.c 1.69 -> 1.70 # drivers/net/smc-ultra.c 1.15 -> 1.16 # include/asm-ia64/sn/sn_cpuid.h 1.4 -> 1.5 # arch/i386/kernel/cpu/mcheck/non-fatal.c 1.3 -> 1.4 # arch/x86_64/kernel/apic.c 1.11 -> 1.13 # drivers/i2c/i2c-core.c 1.16 -> 1.18 # drivers/net/3c515.c 1.18 -> 1.19 # drivers/net/tulip/xircom_tulip_cb.c 1.18 -> 1.19 # arch/i386/Kconfig 1.42 -> 1.44 # net/ipv4/netfilter/ip_nat_core.c 1.18 -> 1.19 # drivers/cdrom/cdrom.c 1.34 -> 1.35 # include/asm-i386/uaccess.h 1.17 -> 1.19 # drivers/isdn/hisax/elsa.c 1.34 -> 1.35 # sound/oss/dmasound/dmasound_core.c 1.7 -> 1.8 # arch/v850/kernel/ma.c 1.1 -> 1.2 # fs/reiserfs/do_balan.c 1.15 -> 1.16 # arch/ia64/lib/do_csum.S 1.8 -> 1.9 # drivers/char/mwave/tp3780i.h 1.1 -> 1.2 # drivers/net/skfp/h/smc.h 1.2 -> 1.3 # include/asm-i386/page.h 1.21 -> 1.23 # arch/ppc/syslib/mpc10x_common.c 1.5 -> 1.6 # drivers/sbus/char/envctrl.c 1.11 -> 1.13 # drivers/mtd/maps/cstm_mips_ixx.c 1.2 -> 1.3 # net/sctp/ulpevent.c 1.10 -> 1.11 # drivers/cdrom/sbpcd.c 1.40 -> 1.41 # net/ipx/af_ipx.c 1.22 -> 1.23 # include/asm-sparc64/pci.h 1.8 -> 1.9 # drivers/char/rocket_int.h 1.3 -> 1.4 # arch/arm/mach-iop310/mm.c 1.3 -> 1.4 # fs/devfs/base.c 1.70 -> 1.71 # include/asm-i386/numnodes.h 1.2 -> 1.3 # arch/i386/kernel/Makefile 1.36 -> 1.37 # drivers/parisc/ccio-dma.c 1.10 -> 1.11 # drivers/scsi/g_NCR5380.c 1.13 -> 1.15 # fs/nfsd/nfsctl.c 1.30 -> 1.31 # Documentation/networking/ifenslave.c 1.3 -> 1.4 # fs/xfs/xfs_trans_dquot.c 1.2 -> 1.3 # kernel/pm.c 1.8 -> 1.10 # drivers/isdn/hisax/rawhdlc.c 1.4 -> 1.5 # drivers/net/slhc.c 1.6 -> 1.7 # net/llc/llc_pdu.c 1.5 -> 1.6 # arch/mips/kernel/setup.c 1.7 -> 1.8 # drivers/net/tg3.h 1.23 -> 1.24 # arch/i386/kernel/acpi/wakeup.S 1.13 -> 1.14 # include/asm-ia64/sn/pci/bridge.h 1.5 -> 1.7 # arch/m68knommu/kernel/ints.c 1.2 -> 1.3 # arch/sparc64/lib/U3copy_from_user.S 1.3 -> 1.4 # drivers/serial/sunsu.c 1.29.1.1 -> 1.32 # drivers/net/tulip/winbond-840.c 1.28 -> 1.29 # drivers/net/wan/sdla_ppp.c 1.18 -> 1.21 # include/asm-v850/sim.h 1.2 -> 1.3 # sound/oss/ite8172.c 1.9 -> 1.10 # drivers/s390/cio/qdio.h 1.2 -> 1.3 # arch/i386/kernel/cpu/cyrix.c 1.8 -> 1.10 # drivers/serial/anakin.c 1.11.1.1 -> 1.13 # drivers/char/synclinkmp.c 1.7 -> 1.8 # drivers/video/controlfb.c 1.22 -> 1.23 # include/linux/serial.h 1.7 -> 1.8 # drivers/atm/iphase.h 1.3 -> 1.4 # fs/xfs/xfs_attr.h 1.1 -> 1.2 # drivers/char/cyclades.c 1.14 -> 1.15 # kernel/cpufreq.c 1.17 -> 1.18 # arch/ia64/kernel/time.c 1.13 -> 1.14 # Documentation/fb/sstfb.txt 1.3 -> 1.4 # drivers/acorn/block/mfmhd.c 1.46 -> 1.48 # include/asm-m68knommu/MC68328.h 1.1 -> 1.2 # drivers/video/cyber2000fb.c 1.24 -> 1.25 # arch/m68k/ifpsp060/src/isp.S 1.4 -> 1.5 # include/asm-m68knommu/siginfo.h 1.1 -> 1.2 # drivers/scsi/FlashPoint.c 1.2 -> 1.5 # drivers/scsi/NCR53C9x.c 1.18 -> 1.19 # drivers/net/fc/iph5526.c 1.16 -> 1.18 # drivers/i2c/i2c-adap-ite.c 1.9 -> 1.10 # drivers/isdn/hisax/l3ni1.c 1.9 -> 1.10 # drivers/block/cciss_scsi.c 1.10 -> 1.11 # net/irda/irlmp_event.c 1.15 -> 1.16 # drivers/net/sk98lin/skqueue.c 1.3 -> 1.4 # drivers/serial/core.c 1.35 -> 1.38 # Documentation/networking/netdevices.txt 1.2 -> 1.3 # fs/mpage.c 1.39 -> 1.40 # drivers/base/bus.c 1.39 -> 1.40 # drivers/isdn/eicon/idi.c 1.4 -> 1.5 # drivers/net/wireless/Kconfig 1.4 -> 1.5 # arch/m68k/kernel/time.c 1.6 -> 1.7 # drivers/scsi/NCR5380.c 1.13 -> 1.14 # drivers/net/wan/comx-hw-munich.c 1.7 -> 1.8 # drivers/net/tulip/interrupt.c 1.15 -> 1.16 # drivers/mtd/maps/sa1100-flash.c 1.6 -> 1.7 # drivers/net/wan/dscc4.c 1.32 -> 1.33 # include/asm-x86_64/uaccess.h 1.6 -> 1.7 # drivers/scsi/sr.c 1.71 -> 1.72 # arch/sparc64/kernel/pci_common.c 1.16 -> 1.17 # Documentation/vm/overcommit-accounting 1.3 -> 1.4 # include/linux/ethtool.h 1.13 -> 1.14 # drivers/scsi/scsi.h 1.64 -> 1.65 # kernel/suspend.c 1.33 -> 1.35 # drivers/media/radio/miropcm20-radio.c 1.11 -> 1.12 # drivers/isdn/hardware/eicon/istream.c 1.1 -> 1.2 # include/linux/fs.h 1.220 -> 1.221 # kernel/futex.c 1.22 -> 1.24 # drivers/atm/lanai.c 1.7 -> 1.8 # arch/i386/mm/Makefile 1.9 -> 1.10 # drivers/video/sa1100fb.c 1.24 -> 1.25 # arch/ia64/sn/kernel/setup.c 1.7 -> 1.9 # arch/i386/mm/ioremap.c 1.15 -> 1.16 # include/asm-arm/arch-sa1100/simpad.h 1.3 -> 1.4 # include/asm-i386/sigcontext.h 1.1 -> 1.2 # arch/arm/kernel/entry-armo.S 1.9 -> 1.10 # include/asm-ppc/page.h 1.12 -> 1.13 # arch/mips64/kernel/process.c 1.5 -> 1.6 # include/asm-i386/semaphore.h 1.7 -> 1.8 # arch/x86_64/kernel/e820.c 1.3 -> 1.4 # drivers/scsi/aic7xxx/aic79xx_osm_pci.c 1.5 -> 1.6 # drivers/char/n_hdlc.c 1.10 -> 1.11 # net/ipv4/tcp.c 1.33 -> 1.34 # drivers/char/ser_a2232.c 1.5 -> 1.6 # arch/i386/kernel/cpu/intel.c 1.15 -> 1.16 # include/asm-s390x/rwsem.h 1.3 -> 1.4 # fs/udf/dir.c 1.11 -> 1.12 # include/asm-m68knommu/MC68VZ328.h 1.1 -> 1.2 # include/asm-mips/pgtable.h 1.9 -> 1.10 # drivers/char/ftape/lowlevel/ftape-calibr.c 1.3 -> 1.4 # drivers/serial/clps711x.c 1.11.1.1 -> 1.13 # drivers/md/md.c 1.139 -> 1.143 # drivers/char/rio/rioinit.c 1.3 -> 1.4 # drivers/scsi/ncr53c8xx.c 1.20 -> 1.22 # drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 1.6 -> 1.7 # drivers/net/sunlance.c 1.13 -> 1.14 # arch/mips/math-emu/dp_add.c 1.1 -> 1.2 # Documentation/vm/locking 1.4 -> 1.5 # arch/ppc64/kernel/ras.c 1.2 -> 1.3 # arch/mips/kernel/r4k_misc.S 1.3 -> 1.4 # arch/mips/au1000/common/serial.c 1.7 -> 1.8 # include/asm-ia64/sn/klconfig.h 1.4 -> 1.5 # arch/arm/kernel/entry-armv.S 1.25 -> 1.26 # arch/v850/kernel/rte_cb_multi.c 1.3 -> 1.4 # drivers/net/wan/lmc/lmc_main.c 1.11 -> 1.13 # drivers/usb/host/ehci-sched.c 1.25 -> 1.26 # arch/mips64/math-emu/sp_add.c 1.1 -> 1.2 # net/sctp/outqueue.c 1.17 -> 1.18 # arch/mips64/math-emu/sp_mul.c 1.1 -> 1.2 # arch/i386/kernel/io_apic.c 1.48 -> 1.50 # fs/xfs/linux/xfs_iops.c 1.15 -> 1.17 # drivers/hotplug/acpiphp_glue.c 1.5 -> 1.6 # include/sound/wavefront.h 1.2 -> 1.3 # drivers/acorn/block/fd1772.c 1.31 -> 1.32 # fs/ext3/acl.c 1.5 -> 1.6 # drivers/net/e100/e100_config.c 1.9 -> 1.10 # drivers/net/sunhme.c 1.27 -> 1.29 # net/decnet/dn_dev.c 1.8 -> 1.9 # arch/mips/math-emu/ieee754sp.c 1.1 -> 1.3 # mm/filemap.c 1.180 -> 1.181 # arch/ppc/platforms/4xx/ibmstbx25.h 1.3 -> 1.4 # drivers/char/ftape/lowlevel/ftape_syms.c 1.2 -> 1.3 # drivers/isdn/hisax/avm_pci.c 1.40 -> 1.41 # sound/oss/dmasound/dmasound_awacs.c 1.9 -> 1.10 # drivers/char/pcmcia/synclink_cs.c 1.8 -> 1.9 # fs/xfs/xfs_mount.c 1.17 -> 1.18 # drivers/net/wan/sbni.c 1.15 -> 1.16 # drivers/isdn/i4l/isdn_ppp_ccp.c 1.9 -> 1.10 # arch/parisc/kernel/perf.c 1.5 -> 1.6 # drivers/mtd/maps/ceiva.c 1.1 -> 1.2 # net/socket.c 1.42 -> 1.43 # arch/sh/kernel/irq.c 1.9 -> 1.10 # arch/mips/math-emu/sp_sub.c 1.1 -> 1.2 # drivers/char/synclink.c 1.25 -> 1.28 # drivers/scsi/gdth.h 1.9 -> 1.10 # drivers/scsi/aic7xxx/aic7xxx_osm.h 1.28 -> 1.29 # drivers/isdn/hardware/eicon/di.c 1.1 -> 1.2 # sound/oss/rme96xx.c 1.11 -> 1.12 # drivers/net/e100/e100_eeprom.c 1.8 -> 1.9 # fs/jfs/xattr.c 1.11 -> 1.12 # arch/i386/kernel/dmi_scan.c 1.26 -> 1.29 # Documentation/filesystems/hpfs.txt 1.2 -> 1.3 # arch/i386/mach-voyager/voyager_smp.c 1.7 -> 1.9 # drivers/char/ftape/zftape/zftape-vtbl.h 1.3 -> 1.4 # drivers/scsi/nsp32.c 1.7 -> 1.8 # drivers/char/rio/riotty.c 1.4 -> 1.5 # init/do_mounts.c 1.34 -> 1.35 # drivers/net/hp100.c 1.13 -> 1.15 # arch/cris/drivers/lpslave/e100lpslavenet.c 1.4 -> 1.5 # drivers/scsi/aacraid/linit.c 1.10 -> 1.12 # arch/ia64/sn/fakeprom/fpmem.c 1.4 -> 1.6 # fs/eventpoll.c 1.14 -> 1.16 # sound/isa/wavefront/wavefront_synth.c 1.11 -> 1.13 # drivers/isdn/hisax/niccy.c 1.26 -> 1.27 # arch/mips/mips-boards/generic/pci.c 1.4 -> 1.5 # arch/sparc64/lib/U3copy_in_user.S 1.2 -> 1.3 # arch/parisc/kernel/irq.c 1.11 -> 1.12 # drivers/char/nvram.c 1.17 -> 1.18 # arch/arm/mach-iop310/iop310-pci.c 1.8 -> 1.9 # mm/swap.c 1.46 -> 1.47 # drivers/serial/uart00.c 1.11 -> 1.12 # drivers/scsi/pcmcia/nsp_cs.h 1.7 -> 1.8 # fs/afs/vnode.c 1.1 -> 1.2 # drivers/message/fusion/mptscsih.c 1.20 -> 1.22 # arch/parisc/kernel/time.c 1.6 -> 1.7 # sound/oss/awe_wave.c 1.9 -> 1.10 # drivers/usb/misc/auerswald.c 1.25 -> 1.26 # arch/ia64/sn/kernel/sn1/sn1_smp.c 1.5 -> 1.6 # drivers/char/sx.c 1.20 -> 1.21 # net/netsyms.c 1.49 -> 1.50 # drivers/ide/setup-pci.c 1.12 -> 1.13 # drivers/char/hangcheck-timer.c 1.1 -> 1.2 # include/asm-s390x/types.h 1.3 -> 1.4 # fs/xattr.c 1.12 -> 1.13 # drivers/scsi/aic7xxx_old.c 1.43 -> 1.47 # drivers/isdn/hisax/l3dss1.c 1.9 -> 1.10 # include/asm-sparc64/uaccess.h 1.5 -> 1.6 # arch/mips/kernel/process.c 1.8 -> 1.9 # arch/mips64/math-emu/sp_sub.c 1.1 -> 1.2 # include/asm-i386/mach-numaq/mach_apic.h 1.12 -> 1.13 # Documentation/sx.txt 1.1 -> 1.2 # drivers/isdn/hysdn/hysdn_boot.c 1.6 -> 1.7 # arch/mips/kernel/traps.c 1.5 -> 1.6 # fs/befs/linuxvfs.c 1.6 -> 1.7 # arch/x86_64/kernel/irq.c 1.8 -> 1.9 # drivers/media/radio/radio-terratec.c 1.8 -> 1.9 # include/asm-i386/rwsem.h 1.11 -> 1.12 # drivers/net/sis900.c 1.32 -> 1.33 # arch/mips/kernel/time.c 1.7 -> 1.8 # arch/x86_64/kernel/pci-gart.c 1.5 -> 1.6 # arch/mips/math-emu/dp_mul.c 1.1 -> 1.2 # scripts/README.Menuconfig 1.2 -> 1.3 # drivers/net/sunhme.h 1.5 -> 1.6 # drivers/scsi/seagate.c 1.14 -> 1.15 # drivers/ide/ide-cd.c 1.38 -> 1.39 # arch/cris/drivers/ethernet.c 1.10 -> 1.11 # arch/sh/stboards/pcidma.c 1.1 -> 1.2 # fs/reiserfs/super.c 1.58 -> 1.59 # drivers/net/ne.c 1.14 -> 1.15 # include/linux/if.h 1.5 -> 1.6 # Documentation/DocBook/deviceiobook.tmpl 1.2 -> 1.3 # mm/memory.c 1.111 -> 1.112 # fs/xfs/xfs_dquot.c 1.3 -> 1.5 # drivers/s390/block/dasd.c 1.49 -> 1.50 # arch/x86_64/kernel/nmi.c 1.8 -> 1.9 # drivers/scsi/aic7xxx/aic7xxx_core.c 1.21 -> 1.23 # arch/ppc64/boot/addSystemMap.c 1.2 -> 1.3 # drivers/isdn/hardware/eicon/dadapter.c 1.1 -> 1.2 # drivers/usb/usb-skeleton.c 1.25 -> 1.26 # drivers/s390/char/sclp_rw.c 1.3 -> 1.4 # drivers/net/acenic.c 1.26 -> 1.27 # net/core/netfilter.c 1.11 -> 1.12 # arch/i386/kernel/acpi/sleep.c 1.1 -> 1.2 # drivers/block/genhd.c 1.70 -> 1.71 # drivers/net/e100/e100_main.c 1.41 -> 1.43 # include/asm-s390/rwsem.h 1.3 -> 1.4 # fs/xfs/xfs_attr_leaf.c 1.3 -> 1.4 # arch/i386/kernel/setup.c 1.68 -> 1.69 # arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c 1.2 -> 1.5 # include/asm-s390/processor.h 1.9 -> 1.10 # arch/mips64/math-emu/dp_sub.c 1.1 -> 1.2 # arch/i386/kernel/smpboot.c 1.50 -> 1.52 # arch/mips/math-emu/sp_fdp.c 1.1 -> 1.2 # drivers/scsi/NCR53c406a.c 1.17 -> 1.18 # drivers/scsi/AM53C974.c 1.11 -> 1.12 # fs/hpfs/dnode.c 1.5 -> 1.6 # Documentation/input/joystick-api.txt 1.3 -> 1.4 # include/linux/sdla_x25.h 1.3 -> 1.4 # arch/i386/kernel/time.c 1.27 -> 1.28 # drivers/net/tokenring/smctr.c 1.17 -> 1.19 # drivers/isdn/hardware/eicon/i4l_idi.c 1.2 -> 1.3 # include/asm-cris/processor.h 1.11 -> 1.12 # drivers/scsi/scsi_syms.c 1.28 -> 1.29 # drivers/net/wan/sdla_chdlc.c 1.18 -> 1.19 # drivers/message/fusion/mptlan.c 1.8 -> 1.9 # arch/sparc64/kernel/time.c 1.21 -> 1.22 # sound/i2c/l3/uda1341.c 1.6 -> 1.7 # include/asm-mips64/processor.h 1.6 -> 1.7 # include/asm-mips/mipsregs.h 1.4 -> 1.5 # drivers/ide/arm/icside.c 1.5 -> 1.6 # include/asm-i386/mmzone.h 1.7 -> 1.8 # drivers/net/wan/dlci.c 1.8 -> 1.9 # arch/x86_64/kernel/io_apic.c 1.5 -> 1.6 # drivers/ide/ide-dma.c 1.9 -> 1.11 # net/core/dev.c 1.55 -> 1.57 # drivers/char/ftape/zftape/zftape-write.c 1.4 -> 1.5 # drivers/net/irda/irda-usb.c 1.34 -> 1.35 # drivers/scsi/scsi.c 1.96 -> 1.97 # include/asm-s390/types.h 1.4 -> 1.5 # include/asm-m68knommu/unistd.h 1.1 -> 1.2 # arch/ppc64/kernel/head.S 1.24 -> 1.25 # drivers/char/watchdog/wdt.c 1.17 -> 1.18 # arch/alpha/kernel/time.c 1.14 -> 1.15 # drivers/s390/cio/device_fsm.c 1.2 -> 1.3 # arch/i386/lib/mmx.c 1.7 -> 1.8 # drivers/i2c/i2c-proc.c 1.15 -> 1.16 # arch/ia64/mm/hugetlbpage.c 1.8 -> 1.9 # include/asm-m68knommu/mcftimer.h 1.1 -> 1.2 # drivers/scsi/aha1542.c 1.21 -> 1.22 # include/asm-mips/ddb5xxx/ddb5xxx.h 1.1 -> 1.2 # arch/x86_64/ia32/ia32_ioctl.c 1.15 -> 1.16 # drivers/acpi/power.c 1.15 -> 1.16 # include/asm-ppc64/uaccess.h 1.5 -> 1.6 # arch/alpha/lib/checksum.c 1.1 -> 1.2 # fs/ext3/dir.c 1.7 -> 1.8 # include/asm-arm/proc-fns.h 1.6 -> 1.7 # arch/mips/dec/boot/decstation.c 1.1 -> 1.2 # drivers/net/wireless/arlan-proc.c 1.7 -> 1.8 # mm/oom_kill.c 1.19 -> 1.20 # include/asm-parisc/assembly.h 1.3 -> 1.4 # fs/ntfs/layout.h 1.15 -> 1.16 # drivers/scsi/aic7xxx/aic7xxx.h 1.8 -> 1.9 # include/asm-i386/pgtable-2level.h 1.6 -> 1.7 # drivers/isdn/hisax/isurf.c 1.21 -> 1.22 # drivers/usb/image/mdc800.c 1.26 -> 1.27 # include/asm-mips64/sn/klconfig.h 1.2 -> 1.3 # arch/i386/kernel/nmi.c 1.15 -> 1.16 # include/asm-i386/numaq.h 1.5 -> 1.6 # include/asm-cris/namei.h 1.1 -> 1.2 # drivers/net/tg3.c 1.59 -> 1.63 # drivers/char/rio/rioroute.c 1.4 -> 1.6 # arch/cris/kernel/time.c 1.7 -> 1.8 # arch/i386/mm/discontig.c 1.7 -> 1.8 # drivers/scsi/aic7xxx/aic79xx_osm.c 1.22 -> 1.23 # drivers/net/pcmcia/axnet_cs.c 1.8 -> 1.10 # drivers/net/3c527.c 1.10 -> 1.12 # drivers/net/sungem.h 1.8 -> 1.10 # sound/oss/wavfront.c 1.12 -> 1.13 # arch/sh/kernel/fpu.c 1.3 -> 1.4 # fs/ext3/xattr.c 1.9 -> 1.10 # arch/ppc/kernel/l2cr.S 1.5 -> 1.6 # arch/ppc64/kernel/lmb.c 1.5 -> 1.6 # include/linux/rwsem-spinlock.h 1.7 -> 1.8 # include/linux/telephony.h 1.4 -> 1.5 # arch/sparc/kernel/time.c 1.13 -> 1.14 # arch/ppc64/boot/addRamDisk.c 1.2 -> 1.3 # fs/buffer.c 1.186 -> 1.188 # fs/direct-io.c 1.29 -> 1.30 # arch/sparc/mm/srmmu.c 1.27 -> 1.28 # arch/sparc/lib/checksum.S 1.1 -> 1.2 # include/linux/i2c-proc.h 1.4 -> 1.5 # fs/nfsd/export.c 1.70 -> 1.71 # drivers/scsi/atari_NCR5380.c 1.8 -> 1.10 # include/asm-parisc/eisa_eeprom.h 1.1 -> 1.2 # drivers/char/epca.c 1.14 -> 1.18 # drivers/net/sk98lin/skvpd.c 1.4 -> 1.5 # sound/oss/cs4232.c 1.8 -> 1.9 # net/sunrpc/auth_unix.c 1.10 -> 1.11 # fs/xfs/pagebuf/page_buf.h 1.22 -> 1.24 # drivers/net/declance.c 1.13 -> 1.14 # drivers/net/irda/actisys-sir.c 1.1 -> 1.2 # arch/sparc/kernel/init_task.c 1.7 -> 1.8 # include/sound/cs46xx_dsp_spos.h 1.8 -> 1.9 # drivers/scsi/pcmcia/fdomain_stub.c 1.11 -> 1.12 # drivers/net/tulip/tulip_core.c 1.39 -> 1.40 # net/ipv6/ndisc.c 1.22 -> 1.23 # fs/bio.c 1.38 -> 1.40 # fs/proc/array.c 1.45 -> 1.46 # MAINTAINERS 1.125 -> 1.126 # drivers/ieee1394/amdtp.c 1.7 -> 1.8 # fs/reiserfs/journal.c 1.61 -> 1.65 # net/irda/irttp.c 1.11 -> 1.12 # arch/mips64/math-emu/ieee754sp.c 1.1 -> 1.3 # fs/ext2/xattr_user.c 1.5 -> 1.6 # include/asm-m68k/dvma.h 1.3 -> 1.4 # arch/mips/math-emu/sp_mul.c 1.1 -> 1.2 # drivers/char/rio/rio_linux.c 1.13 -> 1.14 # sound/core/device.c 1.10 -> 1.11 # drivers/scsi/aic7xxx/aic79xx_osm.h 1.16 -> 1.17 # include/net/irda/vlsi_ir.h 1.7 -> 1.8 # include/asm-parisc/mman.h 1.3 -> 1.4 # drivers/ieee1394/eth1394.c 1.5 -> 1.6 # fs/ext2/xattr.c 1.8 -> 1.9 # drivers/scsi/gdth.c 1.20 -> 1.21 # drivers/net/irda/sir_dev.c 1.3 -> 1.4 # drivers/ieee1394/dv1394-private.h 1.6 -> 1.7 # fs/xfs/linux/xfs_globals.c 1.6 -> 1.7 # include/asm-m68k/io.h 1.5 -> 1.6 # arch/cris/kernel/process.c 1.11 -> 1.12 # drivers/video/sstfb.c 1.19 -> 1.20 # include/linux/time.h 1.9 -> 1.10 # drivers/message/i2o/i2o_core.c 1.15 -> 1.17 # net/sched/sch_htb.c 1.6 -> 1.7 # drivers/s390/char/sclp.c 1.3 -> 1.4 # drivers/net/wireless/arlan.c 1.15 -> 1.16 # drivers/isdn/hisax/amd7930_fn.c 1.13 -> 1.15 # drivers/char/watchdog/wdt_pci.c 1.18 -> 1.19 # drivers/net/wan/sealevel.c 1.8 -> 1.10 # drivers/net/wireless/wavelan_cs.h 1.4 -> 1.5 # include/asm-i386/mach-summit/mach_apic.h 1.18 -> 1.19 # sound/isa/wavefront/wavefront_fx.c 1.8 -> 1.9 # drivers/net/pppoe.c 1.20 -> 1.21 # drivers/scsi/st.c 1.54 -> 1.55 # arch/v850/kernel/time.c 1.3 -> 1.4 # fs/adfs/dir_f.c 1.7 -> 1.8 # drivers/net/b44.h 1.1 -> 1.2 # arch/mips64/kernel/traps.c 1.4 -> 1.5 # include/linux/xattr.h 1.3 -> 1.4 # drivers/net/eepro100.c 1.56 -> 1.57 # net/8021q/vlan.h 1.3 -> 1.4 # Documentation/networking/sk98lin.txt 1.2 -> 1.3 # drivers/net/sk_mca.c 1.6 -> 1.8 # include/asm-sh/pci.h 1.9 -> 1.10 # drivers/i2c/i2c-algo-ibm_ocp.c 1.3 -> 1.4 # arch/ia64/sn/io/sn1/pcibr.c 1.12 -> 1.14 # arch/m68knommu/kernel/time.c 1.2 -> 1.3 # drivers/s390/block/dasd_fba.c 1.10 -> 1.11 # arch/sparc64/mm/hugetlbpage.c 1.6 -> 1.7 # arch/m68k/sun3/config.c 1.8 -> 1.9 # arch/cris/drivers/serial.c 1.11 -> 1.14 # drivers/scsi/aic7xxx/aic79xx.h 1.4 -> 1.6 # drivers/scsi/sym53c8xx.c 1.24 -> 1.29 # Documentation/filesystems/vfs.txt 1.4 -> 1.5 # fs/ntfs/mft.c 1.68 -> 1.69 # arch/i386/kernel/timers/timer_tsc.c 1.11 -> 1.12 # drivers/scsi/qlogicpti.c 1.16 -> 1.17 # drivers/scsi/wd33c93.c 1.7 -> 1.10 # arch/sh/kernel/pci-sh7751.c 1.5 -> 1.6 # arch/mips/baget/wbflush.c 1.1 -> 1.2 # arch/x86_64/kernel/time.c 1.12 -> 1.13 # fs/ext3/xattr_trusted.c 1.1 -> 1.2 # arch/mips/math-emu/ieee754dp.c 1.1 -> 1.3 # drivers/char/watchdog/sbc60xxwdt.c 1.20 -> 1.21 # Documentation/s390/s390dbf.txt 1.3 -> 1.4 # drivers/s390/char/con3215.c 1.11 -> 1.12 # Documentation/scsi/ibmmca.txt 1.6 -> 1.7 # drivers/net/wan/sdla_x25.c 1.16 -> 1.20 # include/sound/uda1341.h 1.1 -> 1.2 # drivers/net/wireless/todo.txt 1.2 -> 1.3 # include/asm-sparc64/rwsem.h 1.8 -> 1.9 # include/asm-mips/pci.h 1.7 -> 1.8 # sound/pci/es1968.c 1.18 -> 1.19 # arch/arm/kernel/time.c 1.13 -> 1.14 # drivers/net/3c503.c 1.12 -> 1.13 # fs/reiserfs/stree.c 1.34 -> 1.35 # drivers/net/fc/tach_structs.h 1.1 -> 1.2 # arch/mips/kernel/pci.c 1.4 -> 1.5 # drivers/scsi/fdomain.c 1.17 -> 1.18 # drivers/scsi/aacraid/commsup.c 1.2 -> 1.3 # drivers/message/i2o/i2o_block.c 1.49 -> 1.51 # fs/seq_file.c 1.6 -> 1.7 # drivers/net/wan/hostess_sv11.c 1.7 -> 1.9 # include/asm-ia64/sn/sn2/shub_mmr.h 1.1 -> 1.2 # arch/i386/kernel/cpu/cpufreq/longrun.c 1.9 -> 1.10 # arch/mips/math-emu/dp_sub.c 1.2 -> 1.3 # drivers/net/sk98lin/skgepnmi.c 1.3 -> 1.5 # kernel/module.c 1.65 -> 1.68 # arch/mips64/sgi-ip27/ip27-pci-dma.c 1.2 -> 1.3 # sound/usb/usbaudio.c 1.31 -> 1.32 # drivers/scsi/qlogicfc.c 1.26 -> 1.27 # arch/ia64/lib/swiotlb.c 1.12 -> 1.13 # arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c 1.2 -> 1.3 # drivers/net/wan/sdlamain.c 1.12 -> 1.14 # drivers/ide/pci/pdc202xx_new.c 1.12 -> 1.13 # arch/ppc64/kernel/smp.c 1.30 -> 1.31 # include/asm-sparc/pci.h 1.7 -> 1.8 # arch/i386/pci/visws.c 1.9 -> 1.10 # drivers/net/pcmcia/Kconfig 1.3 -> 1.4 # Documentation/block/biodoc.txt 1.2 -> 1.3 # sound/oss/nec_vrc5477.c 1.8 -> 1.9 # drivers/serial/21285.c 1.12.1.1 -> 1.14 # drivers/media/dvb/av7110/saa7146_core.c 1.5 -> 1.6 # sound/oss/es1371.c 1.19 -> 1.21 # drivers/usb/class/bluetty.c 1.37 -> 1.38 # arch/sh/kernel/pci-dma.c 1.2 -> 1.3 # drivers/scsi/sd.c 1.102 -> 1.103 # arch/ia64/sn/fakeprom/fw-emu.c 1.7 -> 1.8 # arch/sparc/mm/sun4c.c 1.24 -> 1.26 # drivers/parisc/sba_iommu.c 1.8 -> 1.10 # arch/ppc/kernel/time.c 1.19 -> 1.20 # sound/oss/trident.c 1.30 -> 1.34 # fs/ntfs/namei.c 1.30 -> 1.31 # sound/core/seq/seq_timer.c 1.8 -> 1.9 # drivers/isdn/hisax/enternow_pci.c 1.18 -> 1.19 # arch/arm/mm/proc-arm6_7.S 1.14 -> 1.15 # fs/ntfs/aops.c 1.91 -> 1.93 # include/asm-x86_64/rwsem.h 1.5 -> 1.6 # include/linux/n_r3964.h 1.3 -> 1.4 # drivers/i2c/i2c-dev.c 1.22 -> 1.23 # arch/v850/kernel/irq.c 1.4 -> 1.5 # drivers/net/tokenring/olympic.c 1.19 -> 1.20 # fs/xfs/xfs_da_btree.c 1.3 -> 1.4 # arch/sparc64/prom/misc.c 1.8 -> 1.9 # net/ipv4/netfilter/ip_conntrack_irc.c 1.5 -> 1.7 # drivers/mtd/devices/pmc551.c 1.9 -> 1.10 # mm/slab.c 1.62 -> 1.64 # arch/i386/kernel/suspend.c 1.12 -> 1.13 # drivers/scsi/cpqfcTSworker.c 1.15 -> 1.16 # net/ipv4/netfilter/ip_conntrack_ftp.c 1.7 -> 1.8 # drivers/net/tulip/xircom_cb.c 1.10 -> 1.11 # drivers/scsi/sym53c8xx_2/sym_fw1.h 1.2 -> 1.4 # arch/cris/boot/rescue/head.S 1.4 -> 1.5 # drivers/char/rio/list.h 1.1 -> 1.2 # fs/ext2/acl.c 1.4 -> 1.5 # arch/ia64/sn/kernel/llsc4.c 1.8 -> 1.9 # drivers/scsi/scsi_scan.c 1.60 -> 1.62 # drivers/scsi/sym53c8xx_2/sym_conf.h 1.1 -> 1.2 # arch/mips/kernel/r2300_misc.S 1.1 -> 1.2 # sound/drivers/mtpav.c 1.14 -> 1.15 # drivers/net/irda/sir_kthread.c 1.4 -> 1.5 # drivers/scsi/mac_NCR5380.c 1.5 -> 1.7 # arch/mips/math-emu/sp_div.c 1.1 -> 1.2 # fs/quota_v2.c 1.10 -> 1.11 # drivers/scsi/Makefile 1.38 -> 1.39 # arch/ia64/sn/io/hcl.c 1.7 -> 1.8 # arch/mips/math-emu/sp_add.c 1.1 -> 1.2 # drivers/net/cs89x0.c 1.14 -> 1.15 # arch/um/kernel/irq.c 1.6 -> 1.7 # arch/v850/kernel/rte_ma1_cb.c 1.1 -> 1.2 # include/asm-s390x/processor.h 1.9 -> 1.10 # arch/alpha/kernel/sys_marvel.c 1.5 -> 1.6 # sound/pci/ens1370.c 1.25 -> 1.26 # drivers/scsi/dpt_i2o.c 1.25 -> 1.27 # drivers/ide/ide-io.c 1.2 -> 1.3 # drivers/char/scc.h 1.1 -> 1.2 # drivers/acpi/resources/rsmemory.c 1.11 -> 1.12 # arch/alpha/kernel/traps.c 1.23 -> 1.24 # drivers/i2c/busses/i2c-amd8111.c 1.2 -> 1.3 # arch/s390x/kernel/time.c 1.10 -> 1.11 # kernel/timer.c 1.42 -> 1.43 # fs/nfsd/nfs4xdr.c 1.9 -> 1.10 # drivers/net/eth16i.c 1.11 -> 1.12 # include/asm-mips64/mipsregs.h 1.4 -> 1.5 # arch/mips64/math-emu/ieee754dp.c 1.1 -> 1.3 # drivers/acpi/events/evevent.c 1.22 -> 1.23 # drivers/s390/block/dasd_3990_erp.c 1.10 -> 1.11 # drivers/acpi/hardware/hwregs.c 1.18 -> 1.19 # include/asm-s390x/ccwdev.h 1.1 -> 1.2 # arch/mips/kernel/r2300_switch.S 1.4 -> 1.6 # drivers/net/sk98lin/h/xmac_ii.h 1.3 -> 1.5 # fs/cifs/cifspdu.h 1.3 -> 1.4 # drivers/ieee1394/ohci1394.c 1.20 -> 1.23 # drivers/char/vt.c 1.30 -> 1.32 # arch/ia64/kernel/minstate.h 1.9 -> 1.10 # include/asm-ppc/uninorth.h 1.6 -> 1.7 # arch/m68knommu/platform/5307/vectors.c 1.1 -> 1.2 # arch/ppc64/xmon/xmon.c 1.22 -> 1.23 # fs/jfs/jfs_dmap.c 1.13 -> 1.14 # drivers/hotplug/ibmphp_res.c 1.5 -> 1.6 # arch/ia64/lib/checksum.c 1.3 -> 1.4 # net/sched/sch_gred.c 1.9 -> 1.10 # arch/ia64/mm/discontig.c 1.2 -> 1.3 # include/asm-s390/ccwdev.h 1.1 -> 1.2 # drivers/video/amifb.c 1.20 -> 1.21 # include/net/llc_conn.h 1.12 -> 1.13 # drivers/scsi/sym53c8xx_2/sym_fw2.h 1.2 -> 1.4 # drivers/char/rio/parmmap.h 1.1 -> 1.2 # drivers/usb/serial/kobil_sct.c 1.3 -> 1.4 # drivers/video/retz3fb.c 1.17 -> 1.18 # include/asm-alpha/rwsem.h 1.4 -> 1.5 # fs/jfs/jfs_xattr.h 1.4 -> 1.5 # kernel/exit.c 1.98 -> 1.99 # sound/oss/maestro.c 1.18 -> 1.23 # arch/ia64/kernel/irq.c 1.17 -> 1.18 # arch/cris/mm/fault.c 1.9 -> 1.10 # drivers/net/sk98lin/h/lm80.h 1.3 -> 1.4 # fs/xfs/xfs_dir_leaf.c 1.4 -> 1.5 # drivers/pcmcia/i82365.c 1.22 -> 1.23 # arch/x86_64/kernel/bluesmoke.c 1.6 -> 1.7 # include/asm-sparc/uaccess.h 1.5 -> 1.6 # sound/oss/maestro3.c 1.22 -> 1.23 # arch/sparc64/kernel/ioctl32.c 1.52 -> 1.53 # drivers/i2c/i2c-algo-ite.c 1.4 -> 1.5 # Documentation/s390/TAPE 1.2 -> 1.3 # drivers/net/sk98lin/skgehwt.c 1.2 -> 1.3 # drivers/scsi/Kconfig 1.15 -> 1.16 # sound/oss/ad1816.c 1.8 -> 1.9 # arch/cris/kernel/setup.c 1.10 -> 1.11 # drivers/media/radio/miropcm20-rds-core.c 1.5 -> 1.6 # drivers/media/radio/radio-sf16fmi.c 1.14 -> 1.15 # drivers/macintosh/via-pmu.c 1.14 -> 1.16 # include/asm-i386/mach-default/do_timer.h 1.7 -> 1.8 # drivers/net/e2100.c 1.11 -> 1.12 # drivers/isdn/eicon/adapter.h 1.4 -> 1.5 # arch/ppc/platforms/pmac_feature.c 1.14 -> 1.15 # drivers/serial/68328serial.h 1.1 -> 1.2 # drivers/net/sb1250-mac.c 1.2 -> 1.3 # arch/i386/mm/hugetlbpage.c 1.32 -> 1.33 # sound/pci/cs46xx/dsp_spos_scb_lib.c 1.12 -> 1.14 # sound/core/seq/seq_midi_emul.c 1.6 -> 1.7 # net/irda/irsyms.c 1.12 -> 1.13 # drivers/atm/horizon.h 1.2 -> 1.3 # arch/cris/kernel/kgdb.c 1.5 -> 1.6 # arch/ppc64/kernel/time.c 1.19 -> 1.20 # include/asm-ia64/sn/pda.h 1.2 -> 1.3 # sound/pci/ali5451/ali5451.c 1.21 -> 1.22 # arch/ia64/kernel/perfmon.c 1.35 -> 1.36 # arch/ia64/sn/kernel/sn2/sn2_smp.c 1.2 -> 1.4 # arch/x86_64/mm/ioremap.c 1.7 -> 1.8 # include/asm-i386/mach-bigsmp/mach_apic.h 1.4 -> 1.5 # drivers/isdn/hisax/diva.c 1.38 -> 1.39 # net/core/Makefile 1.11 -> 1.12 # include/asm-ia64/sn/sn2/mmzone_sn2.h 1.2 -> 1.3 # fs/ext3/xattr.h 1.5 -> 1.6 # drivers/net/tokenring/madgemc.c 1.11 -> 1.12 # drivers/isdn/hisax/hfcscard.c 1.14 -> 1.15 # arch/mips64/math-emu/sp_fdp.c 1.1 -> 1.2 # drivers/scsi/sgiwd93.c 1.6 -> 1.7 # drivers/char/rio/riotable.c 1.6 -> 1.7 # arch/mips/kernel/r4k_switch.S 1.4 -> 1.5 # include/asm-ppc64/pgtable.h 1.16 -> 1.17 # drivers/isdn/hisax/ix1_micro.c 1.25 -> 1.26 # drivers/atm/iphase.c 1.12 -> 1.14 # drivers/net/sungem.c 1.31 -> 1.32 # drivers/ide/ppc/mpc8xx.c 1.4 -> 1.5 # include/asm-ia64/sn/sn1/mmzone_sn1.h 1.4 -> 1.5 # drivers/scsi/scsi_ioctl.c 1.14 -> 1.15 # fs/ext3/file.c 1.11 -> 1.12 # drivers/block/cciss.c 1.68 -> 1.69 # arch/alpha/kernel/pci_iommu.c 1.14 -> 1.15 # fs/xfs/xfs_buf.h 1.8 -> 1.9 # drivers/parport/parport_pc.c 1.33 -> 1.35 # drivers/net/sk98lin/skxmac2.c 1.4 -> 1.5 # fs/xfs/xfs_inode.c 1.12 -> 1.13 # sound/sound_core.c 1.14 -> 1.15 # include/asm-m68knommu/MC68EZ328.h 1.1 -> 1.2 # arch/m68k/ifpsp060/src/fpsp.S 1.5 -> 1.6 # drivers/net/via-rhine.c 1.33 -> 1.34 # drivers/isdn/hisax/sedlbauer.c 1.32 -> 1.33 # drivers/net/tokenring/lanstreamer.c 1.15 -> 1.16 # arch/m68k/math-emu/fp_util.S 1.2 -> 1.3 # drivers/acorn/net/ether3.c 1.10 -> 1.12 # net/wanrouter/af_wanpipe.c 1.13 -> 1.15 # fs/cifs/cifs_unicode.h 1.1 -> 1.2 # drivers/md/dm-table.c 1.8 -> 1.9 # drivers/scsi/sym53c8xx_2/sym_fw.c 1.1 -> 1.2 # drivers/scsi/pcmcia/nsp_cs.c 1.16 -> 1.17 # drivers/scsi/esp.c 1.22 -> 1.23 # arch/sparc64/kernel/traps.c 1.21 -> 1.22 # include/asm-mips64/pgtable.h 1.11 -> 1.12 # include/asm-sh/semaphore.h 1.4 -> 1.5 # arch/mips/ddb5xxx/common/pci.c 1.3 -> 1.4 # drivers/net/wan/sdla_fr.c 1.19 -> 1.23 # arch/sparc/kernel/ioport.c 1.9 -> 1.10 # drivers/serial/sunzilog.c 1.26 -> 1.27 # arch/sparc64/kernel/init_task.c 1.8 -> 1.9 # fs/inode.c 1.81 -> 1.82 # drivers/media/video/zr36067.c 1.14 -> 1.15 # drivers/net/sk98lin/h/skdrv2nd.h 1.2 -> 1.3 # include/net/sctp/structs.h 1.34 -> 1.35 # drivers/net/atp.c 1.12 -> 1.13 # include/linux/dcache.h 1.26 -> 1.27 # drivers/usb/storage/freecom.c 1.23 -> 1.24 # drivers/isdn/hisax/teles3.c 1.24 -> 1.25 # drivers/block/scsi_ioctl.c 1.20 -> 1.21 # fs/reiserfs/lbalance.c 1.9 -> 1.10 # arch/m68k/kernel/head.S 1.11 -> 1.12 # drivers/net/hamachi.c 1.22 -> 1.23 # drivers/isdn/hisax/asuscom.c 1.30 -> 1.31 # arch/ppc64/kernel/pci_dn.c 1.7 -> 1.8 # drivers/s390/net/iucv.h 1.5 -> 1.6 # arch/ppc64/kernel/ioctl32.c 1.24 -> 1.25 # arch/ppc64/kernel/pSeries_lpar.c 1.18 -> 1.19 # arch/sparc64/kernel/sbus.c 1.11 -> 1.12 # include/linux/cyclades.h 1.3 -> 1.4 # net/ipv4/netfilter/ip_nat_irc.c 1.3 -> 1.4 # arch/i386/kernel/apic.c 1.33 -> 1.34 # include/asm-i386/mach-default/mach_apic.h 1.18 -> 1.19 # drivers/char/drm/drm_vm.h 1.20 -> 1.21 # drivers/net/wan/wanpipe_multppp.c 1.10 -> 1.11 # fs/ntfs/attrib.c 1.85 -> 1.86 # drivers/char/nwflash.c 1.11 -> 1.12 # net/sctp/primitive.c 1.8 -> 1.9 # include/asm-m68k/page.h 1.6 -> 1.7 # include/linux/ipmi.h 1.1 -> 1.2 # arch/mips64/math-emu/dp_add.c 1.1 -> 1.2 # arch/mips64/math-emu/sp_div.c 1.1 -> 1.2 # arch/x86_64/kernel/smpboot.c 1.13 -> 1.15 # arch/sparc64/lib/U3memcpy.S 1.2 -> 1.3 # arch/sparc64/kernel/iommu_common.h 1.4 -> 1.5 # drivers/net/wireless/orinoco.c 1.20 -> 1.22 # arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c 1.5 -> 1.7 # drivers/hotplug/ibmphp_core.c 1.17 -> 1.18 # drivers/usb/image/microtek.c 1.28 -> 1.29 # arch/m68knommu/platform/5307/entry.S 1.2 -> 1.3 # arch/alpha/boot/tools/objstrip.c 1.2 -> 1.3 # include/asm-ia64/mmzone.h 1.2 -> 1.3 # Documentation/video4linux/bttv/Sound-FAQ 1.5 -> 1.6 # arch/sparc/lib/blockops.S 1.1 -> 1.2 # mm/pdflush.c 1.16 -> 1.17 # arch/mips64/math-emu/dp_mul.c 1.1 -> 1.2 # fs/xfs/xfs_log.h 1.3 -> 1.4 # drivers/usb/serial/usb-serial.h 1.25 -> 1.26 # drivers/scsi/sym53c8xx_2/sym_glue.c 1.15 -> 1.16 # include/net/irda/irda_device.h 1.4 -> 1.5 # include/asm-um/pgtable.h 1.6 -> 1.7 # fs/xfs/linux/xfs_sysctl.c 1.4 -> 1.5 # drivers/net/irda/actisys.c 1.6 -> 1.7 # include/asm-sparc64/pbm.h 1.5 -> 1.6 # drivers/char/rio/rioparam.c 1.2 -> 1.3 # drivers/media/video/zr36120_i2c.c 1.1 -> 1.2 # (new) -> 1.1 drivers/scsi/scsi_pc98.c # (new) -> 1.1 arch/i386/kernel/srat.c # (new) -> 1.1 include/asm-i386/srat.h # (new) -> 1.1 arch/i386/mm/boot_ioremap.c # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/02/24 torvalds@home.transmeta.com 1.1022 # Linux 2.5.63 # -------------------------------------------- # 03/02/24 pavel@ucw.cz 1.1023 # [PATCH] swsusp and S3 fixes # # These are minor fixes for swsusp and S3 sleep. # # - #ifdef mess in acpi_save_state_mem() is simplified # - better error handling in reserving bootmem # - handle video bioses that play with segment registers # - automagic support for S3 on toshiba notebook # - don't try to sync() when pdflush is already stopped # - reorder actions to make pdflush not complain # -------------------------------------------- # 03/02/24 sam@ravnborg.org 1.1024 # [PATCH] fix make rpm # # make rpm has been broken in several kernel versions, fix it. Solves # http://bugme.osdl.org/show_bug.cgi?id=373 which Paolo Ciarrocchi pushed # me to fix. # # 1) Moved make rpm to the noconfig section, thus allowing it to see # the clean target. # 2) Fixed the commandline for find # 3) Use rpmbuild if present # 4) In mkspec use the generic all target, and drop the dep target # This made the build command arch independent # -------------------------------------------- # 03/02/24 torvalds@penguin.transmeta.com 1.1025 # Make ACPI dmi fixup properly depend on CONFIG_ACPI_SLEEP # -------------------------------------------- # 03/02/24 joel.buckley@sun.com 1.1002.17.6 # Sun StorEdge[tm] array SparseLUN support # # Hello, I work on the Sun StorEdge[tm] arrays for Sun Microsystems, Inc. # As part of my testing of Linux, the attached changes are needed to enable # Sparse LUN support for Sun StorEdge[tm] arrays. # -------------------------------------------- # 03/02/24 rmk@flint.arm.linux.org.uk 1.1002.1.25 # Merge rmk@master.kernel.org:/home/dwmw2/BK/uart-2.5 # into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1026 # [PATCH] Spelling fixes - occurrence # # This fixes: # occurence -> occurrence # occurences -> occurrences # # Fixes 13 occurrences (literally!) in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1027 # [PATCH] Spelling fixes - receive # # This fixes: # recieve -> receive # recieved -> received # reciever -> receiver # # Fixes 14 occurrences in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1028 # [PATCH] Spelling fixes - occurring # # This fixes: # occuring -> occurring # # Fixes 29 occurrences in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1029 # [PATCH] Spelling fixes - occurred # # This fixes: # occured -> occurred # # Fixes 135 occurrences in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1030 # [PATCH] Spelling fixes - transceiver # # This fixes: # tranceiver -> transceiver # # Some function names had this misspelling (e.g. e100_reset_tranceiver) # and I changed them, but I haven't tested it. # # Fixes 34 occurrences in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1031 # [PATCH] Spelling fixes - initial # # This fixes: # intial -> initial # intially -> initially # intiali[sz]e -> initiali[sz]e # intiali[sz]ed -> initiali[sz]ed # intiali[sz]es -> initiali[sz]es # intiali[sz]ation -> initiali[sz]ation # # Fixes 32 occurrences in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1032 # [PATCH] Spelling fixes - necessary # # This fixes: # neccessary -> necessary # unneccessary -> unnecessary # # Fixes 46 occurrences in all. # -------------------------------------------- # 03/02/24 mike@aiinc.ca 1.1033 # [PATCH] Spelling fixes - privilege # # This fixes: # priviledge -> privilege # priviledged -> privileged # unpriviledged -> unprivileged # nonpriviledged -> nonprivileged # # Fixes 7 occurrences in all. # -------------------------------------------- # 03/02/24 elenstev@mesatop.com 1.1034 # [PATCH] Spelling fixes handel -> handle # # This patch provides the following spelling fixes: # # handel -> handle # handeling -> handling # handeled -> handled # handeler -> handler # -------------------------------------------- # 03/02/24 elenstev@mesatop.com 1.1035 # [PATCH] 2.5.63 loose pedantry; loose -> lose where appropriate. # # This patch replaces "loose" with "lose" where appropriate. # There remain 56 correct uses of "loose" in the 2.5 kernel source. # -------------------------------------------- # 03/02/24 elenstev@mesatop.com 1.1036 # [PATCH] Spelling fixes for relevent -> relevant # # This patch provides spelling fixes for the following: # # relevent -> relevant # irrelevent -> irrelevant # -------------------------------------------- # 03/02/24 elenstev@mesatop.com 1.1037 # [PATCH] Spelling fixes for negotation -> negotiation and others. # # This patch provides the following spelling fixes: # # negotation -> negotiation # stabelized -> stabilized # labled -> labeled # availible -> available # tabel -> table # -------------------------------------------- # 03/02/24 elenstev@mesatop.com 1.1038 # [PATCH] Spelling fixes for shold -> should and others # # This patch provides spelling fixes for the following: # # shold -> should # Docement -> Document # docomented -> documented # whic -> which # thresold -> threshold # asociation -> association # -------------------------------------------- # 03/02/24 elenstev@mesatop.com 1.1039 # [PATCH] Spelling fixes for paticular -> particular and others. # # This patch provides the following spelling fixes: # # paticular -> particular # usefull -> useful # occurance -> occurrence # occurances -> occurrences # successfull -> successful # -------------------------------------------- # 03/02/25 sandeen@sgi.com 1.1040 # [XFS] Allow the pagebuf daemon to suspend. # # SGI Modid: 2.5.x-xfs:slinx:140015a # -------------------------------------------- # 03/02/25 nathans@sgi.com 1.1041 # [XFS] Remove some off_t abuse in pagebuf_offset and the page_io routine, # after some careful analysis. # # SGI Modid: 2.5.x-xfs:slinx:140039a # -------------------------------------------- # 03/02/25 nathans@sgi.com 1.1042 # [XFS] Fix some comments, remove an unused variable from the stack, fix missing # clear of pb_locking field if IO completion handled in pagebuf_iorequest. # # SGI Modid: 2.5.x-xfs:slinx:140047a # -------------------------------------------- # 03/02/25 nathans@sgi.com 1.1043 # [XFS] Revert the recent hashing change, performance seemed to go way down in # certain benchmarks. This is reverted to how it was, except the number # of hash buckets is larger than previously to attempt to account for the # workload Steve was originally targetting with that change. # # SGI Modid: 2.5.x-xfs:slinx:140053a # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1044 # [XFS] spin_lock_irqsave must take an ulong, not int. Spotted by Anton Blanchard # # SGI Modid: 2.5.x-xfs:slinx:140135a # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1045 # [XFS] fix compilation with CONFIG_SYSCTL=n # # SGI Modid: 2.5.x-xfs:slinx:140173a # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1046 # [XFS] shut up gcc warnings about _lsn_cmp # # SGI Modid: 2.5.x-xfs:slinx:140187a # -------------------------------------------- # 03/02/25 nathans@sgi.com 1.1047 # [XFS] Transition from xfsroot attribute namespace to the more generic trusted # namespace which other filesystems are also supporting. # # SGI Modid: 2.5.x-xfs:slinx:140237a # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1048 # [XFS] Remove flags argument from xattr inode operations again # # SGI Modid: 2.5.x-xfs:slinx:140255a # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.1 # [PATCH] make jiffies wrap 5 min after boot # # From Tim Schmielau # # Force jiffies to start out at five-minutes-before-wrap. To find # jiffy-wrapping bugs. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.2 # [PATCH] Fix user time accounting's handling of jiffies wrap # # Patch from Hugh Dickins # # Userspace shows huge elapsed time across jiffies wrap: with USER_HZ less then # HZ, sys_times needs jiffies_64 to calculate its retval. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.3 # [PATCH] hugetlb put_page speedup # # Rework this function so that we only make the indirect call to the # page-freeing function on the final put_page(), rather than on every # invokation. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.4 # [PATCH] Fix slab batchcount limiting code # # Spotted by Anton Blanchard: Our attempt to limit the interrupts-off time in # slab wasn't very effective. #ifndef DEBUG is never true. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.5 # [PATCH] crc32 optimizations # # Patch from Joakim Tjernlund # # Here is another update(against BK curr) for crc32(). A kind soul pointed out # the optimizations below. # # lib/crc32defs.h: # - Make it possible to define new values for CRC_LE_BITS/CRC_BE_BITS without # modifying the source. # # lib/crc32.c: # - Eliminate the need for ENDIAN_SHIFT. Saves a 24 bit shift in the byte # loops. # # - Swap the XOR expression in DO_CRC. gcc for x86 can not do that simple # optimization itself(gcc 3.2.2 and RH gcc 2.96 tested). Will improve # performance with 20-25% on x86. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.6 # [PATCH] flush_tlb_all preempt safety for voyager # # Patch from Thomas Schlichter # # Make flush_tlb_all() preempt-safe. Same as the ia32 fix. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.7 # [PATCH] Early ioremap support for ia32 # # Patch from Patricia Gaughen , # Dave Hansen # # It provides a very early sort of kmap-by-hand. # # The patch is used by the x440 discontigmem to map the srat tables into low # memory so that the memory can be setup. This remap function is used very # early in the boot process... at the start of setup_arch(). # # This functionality is only available to Summit and NUMAQ. It will work on # other platforms, but they do not need it. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.8 # [PATCH] x440 SRAT parsing # # Use the early ioremap code to parse the Static Resource Affinity Table on # x440 machines. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.9 # [PATCH] use find_get_page() in do_generic_mapping_read() # # do_generic_mapping_read() has an open-coded version of find_get_page() hidden # inside it. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.10 # [PATCH] Make kIrDAd us interruptible sleep # # Use interruptible sleep rather than uninterruptible to avoid perturbing load # average. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.11 # [PATCH] Check for zero d_count in dget() # # Patch from Maneesh Soni # # Turns out that sysfs is doing dget() on a zero-ref dentry. That's a bug, but # dcache is no longer detecting it. # # The check was removed because with lockless d_lookup, there can be cases when # d_lookup and dput are going on concurrently, If d_lookup happens earlier then # it may do dget() on a dentry for which dput() has decremented the ref count # to zero. This race is handled by taking the per dentry lock and checking the # DCACHE_UNHASHED flag. # # The patch open-codes that part of d_lookup(), and restores the BUG check in # dget(). # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.12 # [PATCH] Remove redundant check in pte_alloc_map() # # This check is not needed - the PMD is known to be present. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.13 # [PATCH] SARD accounting fix # # Patch from Rick Lindsley # # Fixes a couple of odd cases in which disk requests were not being accounted # for. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.14 # [PATCH] Fix race between umount and inode pruning # # Patch from Hugh Dickins # # When prune_icache coincides with unmounting, invalidate_inodes notices # the inode it's working on as busy but doesn't wait: Self-destruct in 5 # seconds message, and later iput oopses on freed super_block. # # Neither end is a fast path, so the patch just adds iprune_sem for exclusion. # # The semaphore is held across dispose_list so that # dispose_list->clear_inode->destroy_inode cannot reference a destroyed # superblock. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.15 # [PATCH] fix bug in slab.c debugging # # Patch from John Levon # # Looked like this condition was previously always false ... # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.16 # [PATCH] ext3: fix htree memory leaks # # Patch from Alex Tomas # # Fixes a couple of memory leaks in the htree code. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.17 # [PATCH] fix IRQ balancing disable controls # # Patch from "Martin J. Bligh" # # Fixes up the logic and code which is used to suppress the IRQ balancing code. # # We now just have a single boolean, "irqbalance_disabled". The initial value # comes from the per-platform "NO_BALANCE_IRQ" constant. # # If the platform defaults to "on", users can override this with the # "noirqbalance" kernel boot option. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.18 # [PATCH] don't let OOM killer kill same process repeatedly # # Patch from Rik van Riel # # If a process cannot exit because it's stuck in eg. a driver, it doesn't make # sense to have the OOM killer kill it repeatedly; that could lead to a hung # system. # # Instead, kill another process if the first process we tried to kill hasn't # made any move to exit within 5 seconds. This way we have a much better # chance of recovering the system. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.19 # [PATCH] add some missing gloabl_flush_tlb() calls # # Patch from Thomas Schlichter # # Adds some missing global_flush_tlb() calls, which are requried after a call # to change_page_attr(). # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.20 # [PATCH] ext3: speed up O_SYNC writes # # This is a forward-port of a 2.4 change from Stephen. The (old) 2.5 code is # forcing a commit on every write by artificially dirtying the inode. # # But generic_file_aio_write() has called generic_osync_inode() for us, which # has synced the file data. There is no need to force the extra commit. # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.21 # [PATCH] remove MAX_BLKDEV from genhd.c # # Patch from Andries.Brouwer@cwi.nl # # A patch for genhd.c: # # - removed outdated comments # - removed MAX_BLKDEV # # In genhd.c the variable MAX_BLKDEV was only the size of a hash # table, so I made it MAX_PROBE_HASH. It can be 1, or 23, or 256, or # whatever one wants. # # Note that the current setup requires that every device number # in a given range is mapped by dev_to_index() to the same index # in the hash table, so this routine will have to be adapted in # case one wants to register multimajor ranges. # # Discussion is possible about whether struct blk_probe needs # a dev_t or a kdev_t, but I left things this time. # # If a range can end at precisely the end of [k]dev_t space, # the old code was wrong since (p->dev + p->range) would be 0. # That is why "p->dev + p->range <= dev" was replaced by # "p->dev + p->range - 1 < dev". # -------------------------------------------- # 03/02/25 akpm@digeo.com 1.1039.1.22 # [PATCH] fix md /proc oops # # It it is using a pointer to a ctl_table for its proc_handler function # pointer. Goes oops. # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1039.1.23 # Merge redhat.com:/garz/repo/linus-2.5 # into redhat.com:/garz/repo/net-drivers-2.5 # -------------------------------------------- # 03/02/25 torvalds@home.transmeta.com 1.1049 # Merge master.kernel.org:/home/hch/BK/xfs/linux-2.5 # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1050 # [PATCH] remove kdevname abuse from reiserfs # # dito # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1051 # [PATCH] remove unused variables from the i2c core # # (from lm_sensors CVS) # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1052 # [PATCH] remove an unused function from the i2c core # # (from lm_sensors CVS) # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1053 # [PATCH] remove kdevname abuse from init/do_mount.c # # use bdevname() for block devices. # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1054 # [PATCH] i2c-dev cleanup # # (based on lm_sensors CVS) # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1055 # [PATCH] remove unused last argument to i2c_register_entry # # (from lm_sensors CVS) # -------------------------------------------- # 03/02/25 hch@sgi.com 1.1056 # [PATCH] small i2c-amd8111 updates # # (based on lm_sensors CVS) # -------------------------------------------- # 03/02/25 davej@codemonkey.org.uk 1.1057 # [PATCH] pnp_activate_dev API changes. # # Someone nuked the 2nd arg in 2.5.62, but didn't fix up # all the callers. Lazy. # -------------------------------------------- # 03/02/25 bunk@fs.tum.de 1.1058 # [PATCH] small drivers/atm/* cleanup # # The patch below does the following: # - remove #if'd kernel 2.2 code # - changes one MIN to min # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1059 # [PATCH] Spelling fixes: can't # # cant -> can't (28 occurrences) # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1060 # [PATCH] Spelling fixes: couldn't # # couldnt -> couldn't (4 occurrences) # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1061 # [PATCH] Spelling fixes: doesn't # # doesnt -> doesn't (35 occurrences) # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1062 # [PATCH] Spelling fixes: won't # # wont -> won't (21 occurrences) # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1063 # [PATCH] Spelling fixes: don't # # dont -> don't (135 occurrences) # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1039.1.24 # [netdrvr tg3] disable 5701 h/w bug workaround during core clock reset # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1064 # [PATCH] include unistd.h in m68knommu syscalltable.S # # This includes asm/unistd.h in the system call table setup code for # m68knommu. It needs the local NR_syscalls define. linux/unistd.h is # not assembler clean, so it must be asm/unistd.h. # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1065 # [PATCH] switch m68knommu to using asm-generic/siginfo.h # # This modifies the m68knommu siginfo include file to use # asm-generic/siginfo.h instead of the asm-m68k/siginfo.h. # # The asm-generic/siginfo.h is more appropriate here, and # the m68k is out of date. # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1066 # [PATCH] define struct for m68knommu/ColdFire timer registers # # This creates a sturcture to mirror the m68knommu/ColdFire CPU timer # hardware. This is a much cleaner approach to accessing the timer # registers than the previous set of register address defines. # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1067 # [PATCH] define timer_t and clockid_t for m68k archiecture # # This adds m68k defines for __kernel_timer_t and __kernel_clockid_t. The # reset signal changes means these are now needed. # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1068 # [PATCH] include unistd.h in m68knommu vectors.c # # This includes unistd.h in the high level vector handling code. It needs # NR_syscall. # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1069 # [PATCH] create NR_syscalls for m68knommu architecture # # This patch creates a local NR_syscalls define for the m68knommu # architecture. # -------------------------------------------- # 03/02/25 gerg@snapgear.com 1.1070 # [PATCH] include unistd.h in m68knommu entry.S # # This includes asm/unistd.h in the vector handling code for m68knommu. # It needs the local NR_syscalls define. linux/unistd.h is not assembler # clean, so it must be asm/unistd.h. # -------------------------------------------- # 03/02/25 rusty@rustcorp.com.au 1.1071 # [PATCH] Modules race fix # # Bob Miller points out that the try_module_get in use_module() can, of # course, fail. Secondly, there is a race between setting the module # live, and a simultaneous removal of it. # -------------------------------------------- # 03/02/25 rusty@rustcorp.com.au 1.1072 # [PATCH] Modules code tidy up # # Now that we search for 11 different sections by name, the if/else was # getting unwieldy. Also, handle_section just does relocs, so it's a bit # of a misnomer, and it's best simply moved into the main code. # # This open-codes handle_section, which simply does relocations now. # # Also adds "find_sec" and uses it to find the various sections. # -------------------------------------------- # 03/02/25 mulix@mulix.org 1.1073 # [PATCH] trident 1/3 fix "did not come out of reset" # # The M5451 can sometimes not come out of reset. # # This is non fatal and it continues to work fine, so print a nasty message # but don't fail the driver initialization. # -------------------------------------------- # 03/02/25 mulix@mulix.org 1.1074 # [PATCH] trident 2/3 make me the maintainer # # Make Muli Ben-Yehuda the maintainer for trident as per Alan's suggestion # -------------------------------------------- # 03/02/25 mulix@mulix.org 1.1075 # [PATCH] trident 3/3 use pr_debug instead of TRDBG # # use the standard pr_debug macro instead of TRDBG # -------------------------------------------- # 03/02/25 torvalds@home.transmeta.com 1.1076 # Merge bk://bk.arm.linux.org.uk # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/02/25 elenstev@mesatop.com 1.1077 # [PATCH] replace it's with its where appropriate. # # This patch replaces it's (it is) with its (possessive of it) # in the following cases where the possessive of it is meant. # # to it's -> to its # into it's -> into its # from it's -> from its # of it's -> of its # with it's -> with its # under it's -> under its # about it's -> about its # -------------------------------------------- # 03/02/25 elenstev@mesatop.com 1.1078 # [PATCH] replace its with it's where appropriate. # # This patch replaces its (possessive of it) with it's (it is) # in the following cases where "it is" is meant. # # its a -> it's a # its an -> it's an # its not -> it's not # # except for the files # arch/cris/boot/rescue/head.S # arch/cris/kernel/kgdb.c # where the substitution is "its not" -> "it is not" # to avoid possible problems with single quotes in assembly comments. # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1039.1.25 # [netdrvr tg3] fix NAPI deadlock # * do not hold driver spinlock during RX processing in tg3_poll # (this is the deadlock fix) # * create netif_poll_{en,dis}able to synchronize against dev->poll() # * create __netif_rx_complete to avoid a third irq-save in tg3_poll # * create tg3_netif_{start,stop} as driver-specific helper functions # which disable and enable NAPI polling and TX queueing. Note that # the TX queueing enable/disable is purely advisory, and is not # intended to prevent any races. # * remove tg3_halt call from tg3_set_power_state, as all callers # have already called tg3_halt, making it redundant. Removing this # function call also eliminates some locking complications. # * use new helper __netif_rx_complete in tg3_poll # * create tg3_reset_task, as a function that runs in process context # which resets the NIC. This is needed because tg3_netif_stop() # calls schedule() in the process of disabling dev->poll. # * schedule tg3_reset_task from tg3_tx_timeout # * schedule tg3_reset_task from tg3_timer # * wrap several tg3_halt...tg3_init_hw sequences with # tg3_netif_stop...tg3_netif_start. In addition to synchronizing # with dev->poll, this additionally fixes bugs where we were not # calling netif_wake_queue, when we should have been. # * move netif_start_queue call to very bottom of tg3_open # * add missing tg3_netif_{start,stop} to tg3_{suspend,resume}, # further fixing obvious bugs. # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1039.1.26 # [netdrvr tg3] bump version to 1.4c / Feb 18 # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1039.1.27 # [netdrvr tg3] properly synchronize with TX, in tg3_netif_stop # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1039.1.28 # [netdrvr tg3] fix TX race in previous code, and another buglet # # * call netif_tx_disable after netif_poll_disable, fixing TX race, # in tg3_netif_stop # * follow the ordering of the tg3_netif_stop change, and enable # poll after waking TX, in tg3_netif_start # * after doing those two steps in tg3_netif_start, check for work # using new helper function tg3_cond_int # * add helper function tg3_cond_int, which delivers an interrupt # if and only if the status block was updated (i.e. if work # is likely to be available) # -------------------------------------------- # 03/02/25 jt@hpl.hp.com 1.1039.1.29 # [wireless] cleanup after recent shuffle # # In kernel 2.5.63, you have moved more wireless LAN drivers # into ../drivers/net/wireless/. Unfortunately, there was a bit more to # cleanup as the result of this work. # You will need to : # o Apply the attached patch # o rm /drivers/net/pcmcia/aironet4500_cs.c # # Have fun... # # Jean # # P.S. : You will notice that I took the liberty to organise the config # option in what I hope is a more logical order. # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1079 # [PATCH] Spelling fixes: weird # # wierd -> weird # wierdo -> weirdo # wierdness -> weirdness # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1080 # [PATCH] Spelling fixes: immediately # # immediatly -> immediately # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1081 # [PATCH] Spelling fixes: whether # # wether -> whether # # (A "wether" is a castrated goat.) # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1082 # [PATCH] Spelling fixes: invocation # # invokation -> invocation # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1083 # [PATCH] Spelling fixes: boundary # # boundry -> boundary # boundries -> boundaries # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1084 # [PATCH] Spelling fixes: ugliness # # uglyness -> ugliness # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1085 # [PATCH] Spelling fixes: guarantee # # guarentee -> guarantee # guarenteed -> guaranteed # guarentees -> guarantees # -------------------------------------------- # 03/02/25 mike@aiinc.ca 1.1086 # [PATCH] Spelling fixes: accommodate # # accomodate -> accommodate # accomodated -> accommodated # accomodates -> accommodates # -------------------------------------------- # 03/02/25 jgarzik@redhat.com 1.1078.1.1 # Merge redhat.com:/garz/repo/linus-2.5 # into redhat.com:/garz/repo/net-drivers-2.5 # -------------------------------------------- # 03/02/25 torvalds@home.transmeta.com 1.1087 # Fix up kernel/module.c breakage. Bad Rusty! # -------------------------------------------- # 03/02/26 jgarzik@redhat.com 1.1088 # Merge redhat.com:/garz/repo/linus-2.5 # into redhat.com:/garz/repo/net-drivers-2.5 # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.7 # [PATCH] C99 struct initialisers for aacraid # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.8 # [PATCH] aacraid extra devices. # # >From 2.4 # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.9 # [PATCH] increase aha152x timeouts. # # This made it into 2.4, and aparently fixes # a problem with some tape devices. # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.10 # [PATCH] dpt_i2o bits from 2.4 # # First hunk is unexplained. # Second hunk had the 2.4 changeset comment 'fix warnings' # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.11 # [PATCH] fdomain isa_ API conversion. # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.12 # [PATCH] fdomain pcmcia update from 2.4 # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.13 # [PATCH] Put sgiwd93.c back in sync with 2.4 # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.14 # [PATCH] sun3 updates from 2.4 # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.15 # [PATCH] Erroneous colon in sym53c8xx.c # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.16 # [PATCH] important bits. # # Spelling fixes! Woo! I gotta get me some of that. # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1002.17.17 # [PATCH] copy-paste ; breakage in sym_2 # # Same bug as other sym driver. # -------------------------------------------- # 03/02/26 davej@codemonkey.org.uk 1.1022.1.1 # [PATCH] wd33c93 sync up with 2.4 # -------------------------------------------- # 03/02/26 jejb@raven.il.steeleye.com 1.1022.2.1 # Merge ssh://mulgrave-w/BK/scsi-misc-2.5 # into raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5 # -------------------------------------------- # 03/02/26 jejb@raven.il.steeleye.com 1.1022.1.2 # Merge dj/hch fixes # -------------------------------------------- # 03/02/26 eike-kernel@sf-tec.de 1.1022.1.3 # [PATCH] Hex numbers in NCR53c406a.c # # This patch makes sure that there is a "0x" in front of all hex numbers and # makes all outputs use a single style (all %x instead of mixed %x and %X). # # Eike # -------------------------------------------- # 03/02/26 levon@movementarian.org 1.1022.1.4 # [PATCH] IPS driver typo # # Not tested, against 2.5.63 # # regards # john # -------------------------------------------- # 03/02/26 hch@lst.de 1.1022.1.5 # [PATCH] scsi_add_host/scsi_Remove_host for aic7xxx/aic79xx # # I remember having this submitted a while ago, but here's the code # again, this time with the untested aic79xx bits. # -------------------------------------------- # 03/02/26 levon@movementarian.org 1.1022.1.6 # [PATCH] sun3_NCR typo # # Untested, 2.5.63 # -------------------------------------------- # 03/02/26 levon@movementarian.org 1.1022.1.7 # [PATCH] aix7xxx_old typo # # Untested, against 2.5.63 # # regards # john # -------------------------------------------- # 03/02/26 levon@movementarian.org 1.1022.1.8 # [PATCH] FlashPoint typo # # Against 2.5.63, untested # # regards # john # -------------------------------------------- # 03/02/26 levon@movementarian.org 1.1022.1.9 # [PATCH] NCR5380 typos # # Against 2.5.63, untested # # regards # john # -------------------------------------------- # 03/02/26 hch@lst.de 1.1022.1.10 # [PATCH] update nsp_cs to use scsi_add_host / scsi_remove_host # # On Wed, Feb 26, 2003 at 08:20:05PM +0100, Christoph Hellwig wrote: # > This patch updates nsp_cs to use scsi_add_host / scsi_remove_host when # > compiledfor Linux 2.5 which allows to get rid of the scsi host list # > walks and is a preparation for allowing to support multiple cards of # > this type. # # Sorry, I sent you the wrong paetch, here's the right one: # -------------------------------------------- # 03/02/26 levon@movementarian.org 1.1022.1.11 # [PATCH] AM53C974 typo # # Against 2.5.63, untested # # regards # john # -------------------------------------------- # 03/02/26 mikpe@user.it.uu.se 1.1087.1.1 # [PATCH] APIC ID fixes # # 1) apic_write_around(APIC_ID, boot_cpu_physical_apicid) places the APIC # value in the lower 8 bits of APIC_ID, when it should be in the upper 8. As # as result, it effectively forces the APIC id to always be 0 for the boot # CPU, which is fatal on SMP AMD boxes. # # Fix: don't do the write at all. The APIC_ID value should be right already. # # 2) phys_cpu_present_map = 1 means we always set bit 0, but later on # in setup_local_APIC() we do # if (!clustered_apic_mode && # !test_bit(GET_APIC_ID(apic_read(APIC_ID)), &phys_cpu_present_map)) # BUG(); # and the bug is triggered if the APIC_ID is not zero. # # Fix: initialize 'phys_cpu_present_map' correctly. # -------------------------------------------- # 03/02/26 andmike@us.ibm.com 1.1022.1.12 # [PATCH] scsi_set_device_offline lock fix # # Patrick pointed out that I could get into a ABBA issue with holding # list_lock while calling scsi_eh_scmd_add which takes host_lock. # A call to scsi_prep_fn already holds the queue_lock and then makes a # call to scsi_get_command which takes list_lock. # # -andmike # -- # Michael Anderson # andmike@us.ibm.com # # ===== # name: 00_scsi_set_device_offline.diff # version: 2003-02-26.15:18:19-0800 # against: scsi-misc-2.5 # # scsi.c | 15 +++++++++------ # 1 files changed, 9 insertions(+), 6 deletions(-) # # ===== # -------------------------------------------- # 03/02/26 bunk@fs.tum.de 1.1022.1.13 # [PATCH] fix compilation of g_NCR5380.c # # In 2.5.63 I get the following compile error in drivers/scsi/g_NCR5380.c: # # <-- snip --> # # ... # gcc -Wp,-MD,drivers/scsi/.g_NCR5380.o.d -D__KERNEL__ -Iinclude -Wall # -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common # -pipe -mpreferred-stack-boundary=2 -march=k6 # -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include # -DKBUILD_BASENAME=g_NCR5380 -DKBUILD_MODNAME=g_NCR5380 -c -o # drivers/scsi/g_NCR5380.o drivers/scsi/g_NCR5380.c # drivers/scsi/g_NCR5380.c: In function `generic_NCR5380_detect': # drivers/scsi/g_NCR5380.c:326: too many arguments to function # `pnp_activate_dev' # ... # make[2]: *** [drivers/scsi/g_NCR5380.o] Error 1 # # <-- snip --> # # # The following patch fixes it: # -------------------------------------------- # 03/02/26 bunk@fs.tum.de 1.1022.1.14 # [PATCH] fix the compilation of sym53c416.c # # In 2.5.63 I get the following compile error in drivers/scsi/sym53c416.c: # # # <-- snip --> # # ... # gcc -Wp,-MD,drivers/scsi/.sym53c416.o.d -D__KERNEL__ -Iinclude -Wall # -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common # -pipe -mpreferred-stack-boundary=2 -march=k6 # -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include # -DKBUILD_BASENAME=sym53c416 -DKBUILD_MODNAME=sym53c416 -c -o # drivers/scsi/sym53c416.o drivers/scsi/sym53c416.c # drivers/scsi/sym53c416.c: In function `sym53c416_detect': # drivers/scsi/sym53c416.c:682: too many arguments to function # `pnp_activate_dev' # make[2]: *** [drivers/scsi/sym53c416.o] Error 1 # # <-- snip --> # # # The following patch fixes it: # -------------------------------------------- # 03/02/26 jejb@raven.il.steeleye.com 1.1087.2.1 # Merge by hand # -------------------------------------------- # 03/02/26 torvalds@home.transmeta.com 1.1089 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.5 # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/02/26 torvalds@home.transmeta.com 1.1090 # Merge http://linux-scsi.bkbits.net/scsi-for-linus-2.5 # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # diff -Nru a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl --- a/Documentation/DocBook/deviceiobook.tmpl Thu Feb 27 01:44:22 2003 +++ b/Documentation/DocBook/deviceiobook.tmpl Thu Feb 27 01:44:22 2003 @@ -152,7 +152,7 @@ While the basic functions are defined to be synchronous with respect to each other and ordered with respect to each other the busses the - devices sit on may themselves have asynchronocity. In paticular many + devices sit on may themselves have asynchronicity. In particular many authors are burned by the fact that PCI bus writes are posted asynchronously. A driver author must issue a read from the same device to ensure that writes have occurred in the specific cases the diff -Nru a/Documentation/DocBook/parportbook.tmpl b/Documentation/DocBook/parportbook.tmpl --- a/Documentation/DocBook/parportbook.tmpl Thu Feb 27 01:44:17 2003 +++ b/Documentation/DocBook/parportbook.tmpl Thu Feb 27 01:44:17 2003 @@ -1149,7 +1149,7 @@ peripheral what transfer mode it would like to use, and the peripheral either accepts that mode or rejects it; if the mode is rejected, the host can try again with a different mode. This is - the negotation phase. Once the peripheral has accepted a + the negotiation phase. Once the peripheral has accepted a particular transfer mode, data transfer can begin that mode. diff -Nru a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt --- a/Documentation/block/biodoc.txt Thu Feb 27 01:44:27 2003 +++ b/Documentation/block/biodoc.txt Thu Feb 27 01:44:27 2003 @@ -1038,7 +1038,7 @@ in fact all queues get unplugged as a side-effect. Aside: - This is kind of controversial territory, as its not clear if plugging is + This is kind of controversial territory, as it's not clear if plugging is always the right thing to do. Devices typically have their own queues, and allowing a big queue to build up in software, while letting the device be idle for a while may not always make sense. The trick is to handle the fine diff -Nru a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt --- a/Documentation/fb/sstfb.txt Thu Feb 27 01:44:20 2003 +++ b/Documentation/fb/sstfb.txt Thu Feb 27 01:44:20 2003 @@ -138,7 +138,7 @@ - The driver is not your_favorite_toy-safe. this includes SMP... [Actually from inspection it seems to be safe - Alan] - when using XFree86 FBdev (X over fbdev) you may see strange color - patterns at the border of your windows (the pixels loose the lowest + patterns at the border of your windows (the pixels lose the lowest byte -> basicaly the blue component nd some of the green) . I'm unable to reproduce this with XFree86-3.3, but one of the testers has this problem with XFree86-4. apparently recent Xfree86-4.x solve this diff -Nru a/Documentation/filesystems/hpfs.txt b/Documentation/filesystems/hpfs.txt --- a/Documentation/filesystems/hpfs.txt Thu Feb 27 01:44:22 2003 +++ b/Documentation/filesystems/hpfs.txt Thu Feb 27 01:44:22 2003 @@ -109,7 +109,7 @@ Once I booted English OS/2 working in cp 850 and I created a file on my 852 partition. It marked file name codepage as 850 - good. But when I again booted Czech OS/2, the file was completely inaccessible under any name. It seems that -OS/2 uppercases the search pattern with it's system code page (852) and file +OS/2 uppercases the search pattern with its system code page (852) and file name it's comparing to with its code page (850). These could never match. Is it really what IBM developers wanted? But problems continued. When I created in Czech OS/2 another file in that directory, that file was inaccessible too. OS/2 diff -Nru a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt --- a/Documentation/filesystems/vfs.txt Thu Feb 27 01:44:26 2003 +++ b/Documentation/filesystems/vfs.txt Thu Feb 27 01:44:26 2003 @@ -439,7 +439,7 @@ d_release: called when a dentry is really deallocated - d_iput: called when a dentry looses its inode (just prior to its + d_iput: called when a dentry loses its inode (just prior to its being deallocated). The default when this is NULL is that the VFS calls iput(). If you define this method, you must call iput() yourself diff -Nru a/Documentation/input/joystick-api.txt b/Documentation/input/joystick-api.txt --- a/Documentation/input/joystick-api.txt Thu Feb 27 01:44:23 2003 +++ b/Documentation/input/joystick-api.txt Thu Feb 27 01:44:23 2003 @@ -168,7 +168,7 @@ and too many events to store in the queue get generated. Note that high system load may contribute to space those reads even more. -If time between reads is enough to fill the queue and loose an event, +If time between reads is enough to fill the queue and lose an event, the driver will switch to startup mode and next time you read it, synthetic events (JS_EVENT_INIT) will be generated to inform you of the actual state of the joystick. diff -Nru a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt --- a/Documentation/networking/decnet.txt Thu Feb 27 01:44:17 2003 +++ b/Documentation/networking/decnet.txt Thu Feb 27 01:44:17 2003 @@ -42,7 +42,7 @@ 3) Command line options You can set a DECnet address on the kernel command line for compatibility -with the 2.4 configuration procedure, but in general its not needed any more. +with the 2.4 configuration procedure, but in general it's not needed any more. If you do st a DECnet address on the command line, it has only one purpose which is that its added to the addresses on the loopback device. diff -Nru a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c --- a/Documentation/networking/ifenslave.c Thu Feb 27 01:44:19 2003 +++ b/Documentation/networking/ifenslave.c Thu Feb 27 01:44:19 2003 @@ -299,7 +299,7 @@ else { /* attach a slave interface to the master */ /* two possibilities : - if hwaddr_notset, do nothing. The bond will assign the - hwaddr from it's first slave. + hwaddr from its first slave. - if !hwaddr_notset, assign the master's hwaddr to each slave */ diff -Nru a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt --- a/Documentation/networking/netdevices.txt Thu Feb 27 01:44:20 2003 +++ b/Documentation/networking/netdevices.txt Thu Feb 27 01:44:20 2003 @@ -18,7 +18,8 @@ dev->stop: Synchronization: rtnl_lock() semaphore. Context: process - Notes: netif_running() is guaranteed false when this is called + Note1: netif_running() is guaranteed false + Note2: dev->poll() is guaranteed to be stopped dev->do_ioctl: Synchronization: rtnl_lock() semaphore. @@ -31,10 +32,12 @@ dev->hard_start_xmit: Synchronization: dev->xmit_lock spinlock. Context: BHs disabled + Notes: netif_queue_stopped() is guaranteed false dev->tx_timeout: Synchronization: dev->xmit_lock spinlock. Context: BHs disabled + Notes: netif_queue_stopped() is guaranteed true dev->set_multicast_list: Synchronization: dev->xmit_lock spinlock. diff -Nru a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt --- a/Documentation/networking/sk98lin.txt Thu Feb 27 01:44:25 2003 +++ b/Documentation/networking/sk98lin.txt Thu Feb 27 01:44:25 2003 @@ -187,7 +187,7 @@ this port is not "Sense". If autonegotiation is "On", all three values are possible. If it is "Off", only "Full" and "Half" are allowed. - It is usefull if your link partner does not support all + It is useful if your link partner does not support all possible combinations. - Flow Control diff -Nru a/Documentation/s390/TAPE b/Documentation/s390/TAPE --- a/Documentation/s390/TAPE Thu Feb 27 01:44:29 2003 +++ b/Documentation/s390/TAPE Thu Feb 27 01:44:29 2003 @@ -91,7 +91,7 @@ TODO List - - Driver has to be stabelized still + - Driver has to be stabilized still BUGS diff -Nru a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt --- a/Documentation/s390/s390dbf.txt Thu Feb 27 01:44:26 2003 +++ b/Documentation/s390/s390dbf.txt Thu Feb 27 01:44:26 2003 @@ -14,7 +14,7 @@ If the system still runs but only a subcomponent which uses dbf failes, it is possible to look at the debug logs on a live system via the Linux proc filesystem. -The debug feature may also very usefull for kernel and driver development. +The debug feature may also very useful for kernel and driver development. Design: ------- diff -Nru a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt --- a/Documentation/scsi/ibmmca.txt Thu Feb 27 01:44:26 2003 +++ b/Documentation/scsi/ibmmca.txt Thu Feb 27 01:44:26 2003 @@ -254,7 +254,7 @@ device to be existant, but it has no ldn assigned, it gets a ldn out of 7 to 14. The numbers are assigned in cyclic order. Therefore it takes 8 dynamical reassignments on the SCSI-devices, until a certain device - looses its ldn again. This assures, that dynamical remapping is avoided + loses its ldn again. This assures, that dynamical remapping is avoided during intense I/O between up to 15 SCSI-devices (means pun,lun combinations). A further advantage of this method is, that people who build their kernel without probing on all luns will get what they expect, diff -Nru a/Documentation/sound/oss/Wavefront b/Documentation/sound/oss/Wavefront --- a/Documentation/sound/oss/Wavefront Thu Feb 27 01:44:18 2003 +++ b/Documentation/sound/oss/Wavefront Thu Feb 27 01:44:18 2003 @@ -81,7 +81,7 @@ 2) Why does line XXX of the code look like this .... ? ********************************************************************** -Either because its not finished yet, or because you're a better coder +Either because it's not finished yet, or because you're a better coder than I am, or because you don't understand some aspect of how the card or the code works. diff -Nru a/Documentation/sx.txt b/Documentation/sx.txt --- a/Documentation/sx.txt Thu Feb 27 01:44:22 2003 +++ b/Documentation/sx.txt Thu Feb 27 01:44:22 2003 @@ -265,7 +265,7 @@ -- Done (Ugly: not the way I want it. Copied from serial.c). - write buffer isn't flushed at close. - -- Done. I still seem to loose a few chars at close. + -- Done. I still seem to lose a few chars at close. Sorry. I think that this is a firmware issue. (-> Specialix) - drain hardware before changing termios diff -Nru a/Documentation/video4linux/bttv/Sound-FAQ b/Documentation/video4linux/bttv/Sound-FAQ --- a/Documentation/video4linux/bttv/Sound-FAQ Thu Feb 27 01:44:31 2003 +++ b/Documentation/video4linux/bttv/Sound-FAQ Thu Feb 27 01:44:31 2003 @@ -120,7 +120,7 @@ video_inputs - # of video inputs the card has audio_inputs - historical cruft, not used any more. tuner - which input is the tuner -svhs - which input is svhs (all others are labled composite) +svhs - which input is svhs (all others are labeled composite) muxsel - video mux, input->registervalue mapping pll - same as pll= insmod option tuner_type - same as tuner= insmod option diff -Nru a/Documentation/vm/locking b/Documentation/vm/locking --- a/Documentation/vm/locking Thu Feb 27 01:44:21 2003 +++ b/Documentation/vm/locking Thu Feb 27 01:44:21 2003 @@ -80,7 +80,7 @@ mm start up ... this is a loose form of stability on mm_users. For example, it is used in copy_mm to protect against a racing tlb_gather_mmu single address space optimization, so that the zap_page_range (from -vmtruncate) does not loose sending ipi's to cloned threads that might +vmtruncate) does not lose sending ipi's to cloned threads that might be spawned underneath it and go to user mode to drag in pte's into tlbs. swap_list_lock/swap_device_lock diff -Nru a/Documentation/vm/overcommit-accounting b/Documentation/vm/overcommit-accounting --- a/Documentation/vm/overcommit-accounting Thu Feb 27 01:44:20 2003 +++ b/Documentation/vm/overcommit-accounting Thu Feb 27 01:44:20 2003 @@ -26,7 +26,7 @@ The C language stack growth does an implicit mremap. If you want absolute guarantees and run close to the edge you MUST mmap your stack for the largest size you think you will need. For typical stack usage is does -not matter much but its a corner case if you really really care +not matter much but it's a corner case if you really really care In mode 2 the MAP_NORESERVE flag is ignored. diff -Nru a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS Thu Feb 27 01:44:25 2003 +++ b/MAINTAINERS Thu Feb 27 01:44:25 2003 @@ -1791,10 +1791,10 @@ S: Maintained TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE -P: Ollie Lho -M: ollie@sis.com.tw +P: Muli Ben-Yehuda +M: mulix@mulix.org L: linux-kernel@vger.kernel.org -S: Supported +S: Maintained TMS380 TOKEN-RING NETWORK DRIVER P: Adam Fritzler diff -Nru a/Makefile b/Makefile --- a/Makefile Thu Feb 27 01:44:18 2003 +++ b/Makefile Thu Feb 27 01:44:18 2003 @@ -194,7 +194,7 @@ noconfig_targets := xconfig menuconfig config oldconfig randconfig \ defconfig allyesconfig allnoconfig allmodconfig \ - clean mrproper distclean \ + clean mrproper distclean rpm \ help tags TAGS cscope sgmldocs psdocs pdfdocs htmldocs \ checkconfig checkhelp checkincludes @@ -571,34 +571,6 @@ echo "#endif" ) endef -# RPM target -# --------------------------------------------------------------------------- - -# If you do a make spec before packing the tarball you can rpm -ta it - -spec: - . scripts/mkspec >kernel.spec - -# Build a tar ball, generate an rpm from it and pack the result -# There arw two bits of magic here -# 1) The use of /. to avoid tar packing just the symlink -# 2) Removing the .dep files as they have source paths in them that -# will become invalid - -rpm: clean spec - find . $(RCS_FIND_IGNORE) \ - \( -size 0 -o -name .depend -o -name .hdepend\) \ - -type f -print | xargs rm -f - set -e; \ - cd $(TOPDIR)/.. ; \ - ln -sf $(TOPDIR) $(KERNELPATH) ; \ - tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ - rm $(KERNELPATH) ; \ - cd $(TOPDIR) ; \ - $(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \ - rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ - rm $(TOPDIR)/../$(KERNELPATH).tar.gz - else # ifdef include_config ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) @@ -630,7 +602,7 @@ # --------------------------------------------------------------------------- .PHONY: oldconfig xconfig menuconfig config \ - make_with_config + make_with_config rpm scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE $(Q)$(MAKE) $(build)=scripts/kconfig $@ @@ -762,6 +734,36 @@ tags: FORCE $(call cmd,tags) + +# RPM target +# --------------------------------------------------------------------------- + +# If you do a make spec before packing the tarball you can rpm -ta it + +spec: + . scripts/mkspec >kernel.spec + +# Build a tar ball, generate an rpm from it and pack the result +# There arw two bits of magic here +# 1) The use of /. to avoid tar packing just the symlink +# 2) Removing the .dep files as they have source paths in them that +# will become invalid + +rpm: clean spec + find . $(RCS_FIND_IGNORE) \ + \( -size 0 -o -name .depend -o -name .hdepend \) \ + -type f -print | xargs rm -f + set -e; \ + cd $(TOPDIR)/.. ; \ + ln -sf $(TOPDIR) $(KERNELPATH) ; \ + tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ + rm $(KERNELPATH) ; \ + cd $(TOPDIR) ; \ + $(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \ + RPM=`which rpmbuild`; \ + if [ -z "$$RPM" ]; then RPM=rpm; fi; \ + $$RPM -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ + rm $(TOPDIR)/../$(KERNELPATH).tar.gz # Brief documentation of the typical targets used # --------------------------------------------------------------------------- diff -Nru a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c --- a/arch/alpha/boot/tools/objstrip.c Thu Feb 27 01:44:31 2003 +++ b/arch/alpha/boot/tools/objstrip.c Thu Feb 27 01:44:31 2003 @@ -7,7 +7,7 @@ */ /* * Converts an ECOFF or ELF object file into a bootable file. The - * object file must be a OMAGIC file (i.e., data and bss follow immediatly + * object file must be a OMAGIC file (i.e., data and bss follow immediately * behind the text). See DEC "Assembly Language Programmer's Guide" * documentation for details. The SRM boot process is documented in * the Alpha AXP Architecture Reference Manual, Second Edition by diff -Nru a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c --- a/arch/alpha/kernel/pci_iommu.c Thu Feb 27 01:44:30 2003 +++ b/arch/alpha/kernel/pci_iommu.c Thu Feb 27 01:44:30 2003 @@ -318,7 +318,7 @@ /* Unmap a single streaming mode DMA translation. The DMA_ADDR and SIZE must match what was provided for in a previous pci_map_single call. All other usages are undefined. After this call, reads by - the cpu to the buffer are guarenteed to see whatever the device + the cpu to the buffer are guaranteed to see whatever the device wrote there. */ void diff -Nru a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c --- a/arch/alpha/kernel/sys_marvel.c Thu Feb 27 01:44:27 2003 +++ b/arch/alpha/kernel/sys_marvel.c Thu Feb 27 01:44:27 2003 @@ -440,7 +440,7 @@ return; /* - * There is a local IO7 - redirect all of it's interrupts here. + * There is a local IO7 - redirect all of its interrupts here. */ printk("Redirecting IO7 interrupts to local CPU at PE %u\n", cpuid); diff -Nru a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c --- a/arch/alpha/kernel/time.c Thu Feb 27 01:44:23 2003 +++ b/arch/alpha/kernel/time.c Thu Feb 27 01:44:23 2003 @@ -50,7 +50,7 @@ #include "proto.h" #include "irq_impl.h" -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; extern unsigned long wall_jiffies; /* kernel/timer.c */ diff -Nru a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c --- a/arch/alpha/kernel/traps.c Thu Feb 27 01:44:27 2003 +++ b/arch/alpha/kernel/traps.c Thu Feb 27 01:44:27 2003 @@ -411,7 +411,7 @@ } /* There is an ifdef in the PALcode in MILO that enables a - "kernel debugging entry point" as an unpriviledged call_pal. + "kernel debugging entry point" as an unprivileged call_pal. We don't want to have anything to do with it, but unfortunately several versions of MILO included in distributions have it enabled, diff -Nru a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c --- a/arch/alpha/lib/checksum.c Thu Feb 27 01:44:23 2003 +++ b/arch/alpha/lib/checksum.c Thu Feb 27 01:44:23 2003 @@ -63,7 +63,7 @@ ((unsigned long) ntohs(len) << 16) + ((unsigned long) proto << 8)); - /* Fold down to 32-bits so we don't loose in the typedef-less + /* Fold down to 32-bits so we don't lose in the typedef-less network stack. */ /* 64 to 33 */ result = (result & 0xffffffff) + (result >> 32); diff -Nru a/arch/arm/kernel/entry-armo.S b/arch/arm/kernel/entry-armo.S --- a/arch/arm/kernel/entry-armo.S Thu Feb 27 01:44:21 2003 +++ b/arch/arm/kernel/entry-armo.S Thu Feb 27 01:44:21 2003 @@ -426,7 +426,7 @@ mov r2, #0 tst r4, #1 << 20 @ Check to see if it is a write instruction orreq r2, r2, #FAULT_CODE_WRITE @ Indicate write instruction - mov r1, r4, lsr #22 @ Now branch to the relevent processing routine + mov r1, r4, lsr #22 @ Now branch to the relevant processing routine and r1, r1, #15 << 2 add pc, pc, r1 movs pc, lr diff -Nru a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S --- a/arch/arm/kernel/entry-armv.S Thu Feb 27 01:44:21 2003 +++ b/arch/arm/kernel/entry-armv.S Thu Feb 27 01:44:21 2003 @@ -1026,7 +1026,7 @@ mrs lr, spsr str lr, [r13, #4] @ save spsr_IRQ @ - @ now branch to the relevent MODE handling routine + @ now branch to the relevant MODE handling routine @ mov r13, #PSR_I_BIT | MODE_SVC msr spsr_c, r13 @ switch to SVC_32 mode @@ -1067,7 +1067,7 @@ mrs lr, spsr str lr, [r13, #4] @ - @ now branch to the relevent MODE handling routine + @ now branch to the relevant MODE handling routine @ mov r13, #PSR_I_BIT | MODE_SVC msr spsr_c, r13 @ switch to SVC_32 mode @@ -1109,7 +1109,7 @@ mrs lr, spsr str lr, [r13, #4] @ save spsr_ABT @ - @ now branch to the relevent MODE handling routine + @ now branch to the relevant MODE handling routine @ mov r13, #PSR_I_BIT | MODE_SVC msr spsr_c, r13 @ switch to SVC_32 mode @@ -1150,7 +1150,7 @@ mrs lr, spsr str lr, [r13, #4] @ save spsr_UND @ - @ now branch to the relevent MODE handling routine + @ now branch to the relevant MODE handling routine @ mov r13, #PSR_I_BIT | MODE_SVC msr spsr_c, r13 @ switch to SVC_32 mode diff -Nru a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c --- a/arch/arm/kernel/ptrace.c Thu Feb 27 01:44:18 2003 +++ b/arch/arm/kernel/ptrace.c Thu Feb 27 01:44:18 2003 @@ -435,7 +435,7 @@ * be receiving a prefetch abort shortly. * * If we don't set this breakpoint here, then we can - * loose control of the thread during single stepping. + * lose control of the thread during single stepping. */ if (!alt || predicate(insn) != PREDICATE_ALWAYS) add_breakpoint(child, dbg, pc + 4); diff -Nru a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c --- a/arch/arm/kernel/time.c Thu Feb 27 01:44:26 2003 +++ b/arch/arm/kernel/time.c Thu Feb 27 01:44:26 2003 @@ -32,7 +32,7 @@ #include #include -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; extern unsigned long wall_jiffies; diff -Nru a/arch/arm/mach-iop310/iop310-pci.c b/arch/arm/mach-iop310/iop310-pci.c --- a/arch/arm/mach-iop310/iop310-pci.c Thu Feb 27 01:44:22 2003 +++ b/arch/arm/mach-iop310/iop310-pci.c Thu Feb 27 01:44:22 2003 @@ -296,7 +296,7 @@ * within 3 instructions." * * This does not appear to be the case. With 8 NOPs after the load, we - * see the imprecise abort occuring on the STM of iop310_sec_pci_status() + * see the imprecise abort occurring on the STM of iop310_sec_pci_status() * which is about 10 instructions away. * * Always trust reality! diff -Nru a/arch/arm/mach-iop310/mm.c b/arch/arm/mach-iop310/mm.c --- a/arch/arm/mach-iop310/mm.c Thu Feb 27 01:44:19 2003 +++ b/arch/arm/mach-iop310/mm.c Thu Feb 27 01:44:19 2003 @@ -1,7 +1,7 @@ /* * linux/arch/arm/mach-iop310/mm.c * - * Low level memory intialization for IOP310 based systems + * Low level memory initialization for IOP310 based systems * * Author: Nicolas Pitre * diff -Nru a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S --- a/arch/arm/mm/proc-arm6_7.S Thu Feb 27 01:44:27 2003 +++ b/arch/arm/mm/proc-arm6_7.S Thu Feb 27 01:44:27 2003 @@ -97,7 +97,7 @@ tst r4, r4, lsr #21 @ C = bit 20 sbc r1, r1, r1 @ r1 = C - 1 and r2, r4, #15 << 24 - add pc, pc, r2, lsr #22 @ Now branch to the relevent processing routine + add pc, pc, r2, lsr #22 @ Now branch to the relevant processing routine movs pc, lr b Ldata_unknown diff -Nru a/arch/cris/boot/rescue/head.S b/arch/cris/boot/rescue/head.S --- a/arch/cris/boot/rescue/head.S Thu Feb 27 01:44:27 2003 +++ b/arch/cris/boot/rescue/head.S Thu Feb 27 01:44:27 2003 @@ -130,7 +130,7 @@ ;; first put a jump test to give a possibility of upgrading the rescue code ;; without erasing/reflashing the sector. we put a longword of -1 here and if - ;; its not -1, we jump using the value as jump target. since we can always + ;; it is not -1, we jump using the value as jump target. since we can always ;; change 1's to 0's without erasing the sector, it is possible to add new ;; code after this and altering the jumptarget in an upgrade. diff -Nru a/arch/cris/drivers/ethernet.c b/arch/cris/drivers/ethernet.c --- a/arch/cris/drivers/ethernet.c Thu Feb 27 01:44:22 2003 +++ b/arch/cris/drivers/ethernet.c Thu Feb 27 01:44:22 2003 @@ -236,7 +236,7 @@ /* Network speed indication. */ static struct timer_list speed_timer = TIMER_INITIALIZER(NULL, 0, 0); static struct timer_list clear_led_timer = TIMER_INITIALIZER(NULL, 0, 0); -static int current_speed; /* Speed read from tranceiver */ +static int current_speed; /* Speed read from transceiver */ static int current_speed_selection; /* Speed selected by user */ static int led_next_time; static int led_active; @@ -276,7 +276,7 @@ static void e100_send_mdio_cmd(unsigned short cmd, int write_cmd); static void e100_send_mdio_bit(unsigned char bit); static unsigned char e100_receive_mdio_bit(void); -static void e100_reset_tranceiver(void); +static void e100_reset_transceiver(void); static void e100_clear_network_leds(unsigned long dummy); static void e100_set_network_leds(int active); @@ -786,7 +786,7 @@ } static void -e100_reset_tranceiver(void) +e100_reset_transceiver(void) { unsigned short cmd; unsigned short data; @@ -826,9 +826,9 @@ RESET_DMA(NETWORK_TX_DMA_NBR); WAIT_DMA(NETWORK_TX_DMA_NBR); - /* Reset the tranceiver. */ + /* Reset the transceiver. */ - e100_reset_tranceiver(); + e100_reset_transceiver(); /* and get rid of the packet that never got an interrupt */ diff -Nru a/arch/cris/drivers/lpslave/e100lpslavenet.c b/arch/cris/drivers/lpslave/e100lpslavenet.c --- a/arch/cris/drivers/lpslave/e100lpslavenet.c Thu Feb 27 01:44:22 2003 +++ b/arch/cris/drivers/lpslave/e100lpslavenet.c Thu Feb 27 01:44:22 2003 @@ -129,7 +129,7 @@ static void e100_hardware_send_packet(unsigned long hostcmd, char *buf, int length); static void update_rx_stats(struct net_device_stats *); static void update_tx_stats(struct net_device_stats *); -static void e100_reset_tranceiver(void); +static void e100_reset_transceiver(void); static void boot_slave(unsigned char *code); @@ -528,7 +528,7 @@ } static void -e100_reset_tranceiver(void) +e100_reset_transceiver(void) { /* To do: Reboot and setup slave Etrax */ } @@ -554,9 +554,9 @@ RESET_DMA(4); WAIT_DMA(4); - /* Reset the tranceiver. */ + /* Reset the transceiver. */ - e100_reset_tranceiver(); + e100_reset_transceiver(); /* and get rid of the packet that never got an interrupt */ diff -Nru a/arch/cris/drivers/serial.c b/arch/cris/drivers/serial.c --- a/arch/cris/drivers/serial.c Thu Feb 27 01:44:26 2003 +++ b/arch/cris/drivers/serial.c Thu Feb 27 01:44:26 2003 @@ -132,7 +132,7 @@ * Items worth noticing: * * No Etrax100 port 1 workarounds (does only compile on 2.4 anyway now) - * RS485 is not ported (why cant it be done in userspace as on x86 ?) + * RS485 is not ported (why can't it be done in userspace as on x86 ?) * Statistics done through async_icount - if any more stats are needed, * that's the place to put them or in an arch-dep version of it. * timeout_interrupt and the other fast timeout stuff not ported yet @@ -1766,7 +1766,7 @@ B= Break character (0x00) with framing error. E= Error byte with parity error received after B characters. -F= "Faked" valid byte received immediatly after B characters. +F= "Faked" valid byte received immediately after B characters. V= Valid byte 1. @@ -2802,7 +2802,7 @@ info->tx_ctrl |= (0x80 | 0x40); /* Set bit 7 (txd) and 6 (tr_enable) */ info->port[REG_TR_CTRL] = info->tx_ctrl; - /* the DMA gets awfully confused if we toggle the tranceiver like this + /* the DMA gets awfully confused if we toggle the transceiver like this * so we need to reset it */ *info->ocmdadr = 4; diff -Nru a/arch/cris/kernel/kgdb.c b/arch/cris/kernel/kgdb.c --- a/arch/cris/kernel/kgdb.c Thu Feb 27 01:44:30 2003 +++ b/arch/cris/kernel/kgdb.c Thu Feb 27 01:44:30 2003 @@ -1486,7 +1486,7 @@ move.d $r0,[reg+0x62] ; Save the return address in BRP move $usp,[reg+0x66] ; USP -;; get the serial character (from debugport.c) and check if its a ctrl-c +;; get the serial character (from debugport.c) and check if it is a ctrl-c jsr getDebugChar cmp.b 3, $r10 diff -Nru a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c --- a/arch/cris/kernel/process.c Thu Feb 27 01:44:25 2003 +++ b/arch/cris/kernel/process.c Thu Feb 27 01:44:25 2003 @@ -154,7 +154,7 @@ #if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM) cause_of_death = 0xbedead; #else - /* Since we dont plan to keep on reseting the watchdog, + /* Since we don't plan to keep on reseting the watchdog, the key can be arbitrary hence three */ *R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, 3) | IO_STATE(R_WATCHDOG, enable, start); @@ -226,7 +226,7 @@ swstack = ((struct switch_stack *)childregs) - 1; - swstack->r9 = 0; /* parameter to ret_from_sys_call, 0 == dont restart the syscall */ + swstack->r9 = 0; /* parameter to ret_from_sys_call, 0 == don't restart the syscall */ /* we want to return into ret_from_sys_call after the _resume */ diff -Nru a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c --- a/arch/cris/kernel/setup.c Thu Feb 27 01:44:30 2003 +++ b/arch/cris/kernel/setup.c Thu Feb 27 01:44:30 2003 @@ -164,7 +164,7 @@ paging_init(); - /* We dont use a command line yet, so just re-initialize it without + /* We don't use a command line yet, so just re-initialize it without saving anything that might be there. */ *cmdline_p = command_line; diff -Nru a/arch/cris/kernel/signal.c b/arch/cris/kernel/signal.c --- a/arch/cris/kernel/signal.c Thu Feb 27 01:44:17 2003 +++ b/arch/cris/kernel/signal.c Thu Feb 27 01:44:17 2003 @@ -494,7 +494,7 @@ case -ERESTARTNOHAND: /* ERESTARTNOHAND means that the syscall should only be restarted if there was no handler for the signal, and since - we only get here if there is a handler, we dont restart */ + we only get here if there is a handler, we don't restart */ regs->r10 = -EINTR; break; diff -Nru a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c --- a/arch/cris/kernel/time.c Thu Feb 27 01:44:24 2003 +++ b/arch/cris/kernel/time.c Thu Feb 27 01:44:24 2003 @@ -45,7 +45,7 @@ #include -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static int have_rtc; /* used to remember if we have an RTC or not */ diff -Nru a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c --- a/arch/cris/mm/fault.c Thu Feb 27 01:44:28 2003 +++ b/arch/cris/mm/fault.c Thu Feb 27 01:44:28 2003 @@ -170,7 +170,7 @@ if (miss) { /* see if the pte exists at all - * refer through current_pgd, dont use mm->pgd + * refer through current_pgd, don't use mm->pgd */ pmd = (pmd_t *)(current_pgd + pgd_index(address)); diff -Nru a/arch/cris/mm/tlb.c b/arch/cris/mm/tlb.c --- a/arch/cris/mm/tlb.c Thu Feb 27 01:44:18 2003 +++ b/arch/cris/mm/tlb.c Thu Feb 27 01:44:18 2003 @@ -58,7 +58,7 @@ int i; unsigned long flags; - /* the vpn of i & 0xf is so we dont write similar TLB entries + /* the vpn of i & 0xf is so we don't write similar TLB entries * in the same 4-way entry group. details.. */ diff -Nru a/arch/i386/Kconfig b/arch/i386/Kconfig --- a/arch/i386/Kconfig Thu Feb 27 01:44:19 2003 +++ b/arch/i386/Kconfig Thu Feb 27 01:44:19 2003 @@ -75,6 +75,11 @@ If you don't have one of these computers, you should say N here. +config ACPI_SRAT + bool + default y + depends on NUMA && X86_SUMMIT + config X86_BIGSMP bool "Support for other sub-arch SMP systems with more than 8 CPUs" help @@ -483,7 +488,7 @@ # Common NUMA Features config NUMA bool "Numa Memory Allocation Support" - depends on X86_NUMAQ + depends on (HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT && ACPI && !ACPI_HT_ONLY))) config DISCONTIGMEM bool @@ -750,6 +755,13 @@ config HAVE_DEC_LOCK bool depends on (SMP || PREEMPT) && X86_CMPXCHG + default y + +# turning this on wastes a bunch of space. +# Summit needs it only when NUMA is on +config BOOT_IOREMAP + bool + depends on (X86_SUMMIT && NUMA) default y endmenu diff -Nru a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile Thu Feb 27 01:44:19 2003 +++ b/arch/i386/kernel/Makefile Thu Feb 27 01:44:19 2003 @@ -28,6 +28,7 @@ obj-$(CONFIG_EDD) += edd.o obj-$(CONFIG_MODULES) += module.o obj-y += sysenter.o +obj-$(CONFIG_ACPI_SRAT) += srat.o EXTRA_AFLAGS := -traditional diff -Nru a/arch/i386/kernel/acpi/sleep.c b/arch/i386/kernel/acpi/sleep.c --- a/arch/i386/kernel/acpi/sleep.c Thu Feb 27 01:44:23 2003 +++ b/arch/i386/kernel/acpi/sleep.c Thu Feb 27 01:44:23 2003 @@ -2,6 +2,7 @@ * sleep.c - x86-specific ACPI sleep support. * * Copyright (C) 2001-2003 Patrick Mochel + * Copyright (C) 2001-2003 Pavel Machek */ #include @@ -34,10 +35,8 @@ */ int acpi_save_state_mem (void) { -#if CONFIG_X86_PAE - panic("S3 and PAE do not like each other for now."); - return 1; -#endif + if (!acpi_wakeup_address) + return 1; init_low_mapping(swapper_pg_dir, USER_PTRS_PER_PGD); memcpy((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start); acpi_copy_wakeup_routine(acpi_wakeup_address); @@ -65,17 +64,24 @@ /** * acpi_reserve_bootmem - do _very_ early ACPI initialisation * - * We allocate a page in low memory for the wakeup + * We allocate a page from the first 1MB of memory for the wakeup * routine for when we come back from a sleep state. The - * runtime allocator allows specification of <16M pages, but not - * <1M pages. + * runtime allocator allows specification of <16MB pages, but not + * <1MB pages. */ void __init acpi_reserve_bootmem(void) { + if ((&wakeup_end - &wakeup_start) > PAGE_SIZE) { + printk(KERN_ERR "ACPI: Wakeup code way too big, S3 disabled.\n"); + return; + } +#if CONFIG_X86_PAE + printk(KERN_ERR "ACPI: S3 and PAE do not like each other for now, S3 disabled.\n"); + return; +#endif acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE); - if ((&wakeup_end - &wakeup_start) > PAGE_SIZE) - printk(KERN_CRIT "ACPI: Wakeup code way too big, will crash on attempt to suspend\n"); - printk(KERN_DEBUG "ACPI: have wakeup address 0x%8.8lx\n", acpi_wakeup_address); + if (!acpi_wakeup_address) + printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n"); } static int __init acpi_sleep_setup(char *str) diff -Nru a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S --- a/arch/i386/kernel/acpi/wakeup.S Thu Feb 27 01:44:20 2003 +++ b/arch/i386/kernel/acpi/wakeup.S Thu Feb 27 01:44:20 2003 @@ -44,6 +44,9 @@ testl $1, video_flags - wakeup_code jz 1f lcall $0xc000,$3 + movw %cs, %ax + movw %ax, %ds # Bios might have played with that + movw %ax, %ss 1: testl $2, video_flags - wakeup_code diff -Nru a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c --- a/arch/i386/kernel/apic.c Thu Feb 27 01:44:31 2003 +++ b/arch/i386/kernel/apic.c Thu Feb 27 01:44:31 2003 @@ -665,7 +665,6 @@ } set_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability); mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; - boot_cpu_physical_apicid = 0; if (nmi_watchdog != NMI_NONE) nmi_watchdog = NMI_LOCAL_APIC; @@ -1154,8 +1153,7 @@ connect_bsp_APIC(); - phys_cpu_present_map = 1; - apic_write_around(APIC_ID, boot_cpu_physical_apicid); + phys_cpu_present_map = 1 << boot_cpu_physical_apicid; apic_pm_init2(); diff -Nru a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c --- a/arch/i386/kernel/apm.c Thu Feb 27 01:44:17 2003 +++ b/arch/i386/kernel/apm.c Thu Feb 27 01:44:17 2003 @@ -1096,7 +1096,7 @@ * @blank: on/off * * Attempt to blank the console, firstly by blanking just video device - * zero, and if that fails (some BIOSes dont support it) then it blanks + * zero, and if that fails (some BIOSes don't support it) then it blanks * all video devices. Typically the BIOS will do laptop backlight and * monitor powerdown for us. */ diff -Nru a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c --- a/arch/i386/kernel/cpu/cpufreq/longrun.c Thu Feb 27 01:44:27 2003 +++ b/arch/i386/kernel/cpu/cpufreq/longrun.c Thu Feb 27 01:44:27 2003 @@ -133,7 +133,7 @@ * longrun_determine_freqs - determines the lowest and highest possible core frequency * * Determines the lowest and highest possible core frequencies on this CPU. - * This is neccessary to calculate the performance percentage according to + * This is necessary to calculate the performance percentage according to * TMTA rules: * performance_pctg = (target_freq - low_freq)/(high_freq - low_freq) */ diff -Nru a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c --- a/arch/i386/kernel/cpu/cyrix.c Thu Feb 27 01:44:20 2003 +++ b/arch/i386/kernel/cpu/cyrix.c Thu Feb 27 01:44:20 2003 @@ -49,7 +49,7 @@ * Cx86_dir0_msb is a HACK needed by check_cx686_cpuid/slop in bugs.h in * order to identify the Cyrix CPU model after we're out of setup.c * - * Actually since bugs.h doesnt even reference this perhaps someone should + * Actually since bugs.h doesn't even reference this perhaps someone should * fix the documentation ??? */ static unsigned char Cx86_dir0_msb __initdata = 0; @@ -77,7 +77,7 @@ * BIOSes for compatibility with DOS games. This makes the udelay loop * work correctly, and improves performance. * - * FIXME: our newer udelay uses the tsc. We dont need to frob with SLOP + * FIXME: our newer udelay uses the tsc. We don't need to frob with SLOP */ extern void calibrate_delay(void) __init; diff -Nru a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c --- a/arch/i386/kernel/cpu/intel.c Thu Feb 27 01:44:21 2003 +++ b/arch/i386/kernel/cpu/intel.c Thu Feb 27 01:44:21 2003 @@ -151,7 +151,7 @@ #ifdef CONFIG_X86_F00F_BUG /* * All current models of Pentium and Pentium with MMX technology CPUs - * have the F0 0F bug, which lets nonpriviledged users lock up the system. + * have the F0 0F bug, which lets nonprivileged users lock up the system. * Note that the workaround only should be initialized once... */ c->f00f_bug = 0; diff -Nru a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c --- a/arch/i386/kernel/cpu/mcheck/non-fatal.c Thu Feb 27 01:44:19 2003 +++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c Thu Feb 27 01:44:19 2003 @@ -33,7 +33,7 @@ rdmsr (MSR_IA32_MC0_STATUS+i*4, low, high); if (high & (1<<31)) { - printk (KERN_EMERG "MCE: The hardware reports a non fatal, correctable incident occured on CPU %d.\n", + printk (KERN_EMERG "MCE: The hardware reports a non fatal, correctable incident occurred on CPU %d.\n", smp_processor_id()); printk (KERN_EMERG "Bank %d: %08x%08x\n", i, high, low); diff -Nru a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c --- a/arch/i386/kernel/dmi_scan.c Thu Feb 27 01:44:22 2003 +++ b/arch/i386/kernel/dmi_scan.c Thu Feb 27 01:44:22 2003 @@ -440,7 +440,7 @@ { printk(KERN_INFO " *** Possibly defective BIOS detected (irqtable)\n"); printk(KERN_INFO " *** Many BIOSes matching this signature have incorrect IRQ routing tables.\n"); - printk(KERN_INFO " *** If you see IRQ problems, in paticular SCSI resets and hangs at boot\n"); + printk(KERN_INFO " *** If you see IRQ problems, in particular SCSI resets and hangs at boot\n"); printk(KERN_INFO " *** contact your hardware vendor and ask about updates.\n"); printk(KERN_INFO " *** Building an SMP kernel may evade the bug some of the time.\n"); #ifdef CONFIG_X86_IO_APIC @@ -455,7 +455,7 @@ static __init int broken_toshiba_keyboard(struct dmi_blacklist *d) { - printk(KERN_WARNING "Toshiba with broken keyboard detected. If your keyboard sometimes generates 3 keypresses instead of one, contact pavel@ucw.cz\n"); + printk(KERN_WARNING "Toshiba with broken keyboard detected. If your keyboard sometimes generates 3 keypresses instead of one, see http://davyd.ucc.asn.au/projects/toshiba/README\n"); return 0; } @@ -470,6 +470,23 @@ return 0; } +#ifdef CONFIG_ACPI_SLEEP +static __init int reset_videomode_after_s3(struct dmi_blacklist *d) +{ + /* See acpi_wakeup.S */ + extern long acpi_video_flags; + acpi_video_flags |= 2; + return 0; +} + +static __init int reset_videobios_after_s3(struct dmi_blacklist *d) +{ + extern long acpi_video_flags; + acpi_video_flags |= 1; + return 0; +} +#endif + /* * Some Bioses enable the PS/2 mouse (touchpad) at resume, even if it was * disabled before the suspend. Linux used to get terribly confused by that. @@ -743,6 +760,12 @@ MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), NO_MATCH, NO_MATCH, NO_MATCH } }, +#ifdef CONFIG_ACPI_SLEEP + { reset_videomode_after_s3, "Toshiba Satellite 4030cdt", { /* Reset video mode after returning from ACPI S3 sleep */ + MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), + NO_MATCH, NO_MATCH, NO_MATCH + } }, +#endif { print_if_true, KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.", { MATCH(DMI_SYS_VENDOR, "IBM"), diff -Nru a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c --- a/arch/i386/kernel/io_apic.c Thu Feb 27 01:44:21 2003 +++ b/arch/i386/kernel/io_apic.c Thu Feb 27 01:44:21 2003 @@ -46,7 +46,7 @@ /* * Is the SiS APIC rmw bug present ? - * -1 = dont know, 0 = no, 1 = yes + * -1 = don't know, 0 = no, 1 = yes */ int sis_apic_bug = -1; @@ -223,7 +223,7 @@ extern unsigned long irq_affinity [NR_IRQS]; int __cacheline_aligned pending_irq_balance_apicid [NR_IRQS]; -static int irqbalance_disabled __initdata = 0; +static int irqbalance_disabled = NO_BALANCE_IRQ; static int physical_balance = 0; struct irq_cpu_info { @@ -492,7 +492,7 @@ unsigned long allowed_mask; unsigned int new_cpu; - if (no_balance_irq) + if (irqbalance_disabled) return; allowed_mask = cpu_online_map & irq_affinity[irq]; diff -Nru a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c --- a/arch/i386/kernel/irq.c Thu Feb 27 01:44:17 2003 +++ b/arch/i386/kernel/irq.c Thu Feb 27 01:44:17 2003 @@ -87,7 +87,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ #if CONFIG_X86 diff -Nru a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c --- a/arch/i386/kernel/nmi.c Thu Feb 27 01:44:24 2003 +++ b/arch/i386/kernel/nmi.c Thu Feb 27 01:44:24 2003 @@ -325,7 +325,7 @@ * as these watchdog NMI IRQs are generated on every CPU, we only * have to check the current processor. * - * since NMIs dont listen to _any_ locks, we have to be extremely + * since NMIs don't listen to _any_ locks, we have to be extremely * careful not to rely on unsafe variables. The printk might lock * up though, so we have to break up any console locks first ... * [when there will be more tty-related locks, break them up diff -Nru a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c Thu Feb 27 01:44:23 2003 +++ b/arch/i386/kernel/setup.c Thu Feb 27 01:44:23 2003 @@ -818,7 +818,7 @@ request_resource(&iomem_resource, res); if (e820.map[i].type == E820_RAM) { /* - * We dont't know which RAM region contains kernel data, + * We don't know which RAM region contains kernel data, * so we try it repeatedly and let the resource manager * test it. */ diff -Nru a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c --- a/arch/i386/kernel/smpboot.c Thu Feb 27 01:44:23 2003 +++ b/arch/i386/kernel/smpboot.c Thu Feb 27 01:44:23 2003 @@ -170,7 +170,7 @@ /* * TSC synchronization. * - * We first check wether all CPUs have their TSC's synchronized, + * We first check whether all CPUs have their TSC's synchronized, * then we print a warning if not, and always resync. */ @@ -956,7 +956,7 @@ smp_tune_scheduling(); /* - * If we couldnt find an SMP configuration at boot time, + * If we couldn't find an SMP configuration at boot time, * get out of here now! */ if (!smp_found_config) { diff -Nru a/arch/i386/kernel/srat.c b/arch/i386/kernel/srat.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/i386/kernel/srat.c Thu Feb 27 01:44:31 2003 @@ -0,0 +1,448 @@ +/* + * Some of the code in this file has been gleaned from the 64 bit + * discontigmem support code base. + * + * Copyright (C) 2002, IBM Corp. + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or + * NON INFRINGEMENT. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Send feedback to Pat Gaughen + */ +#include +#include +#include +#include +#include +#include + +/* + * proximity macros and definitions + */ +#define NODE_ARRAY_INDEX(x) ((x) / 8) /* 8 bits/char */ +#define NODE_ARRAY_OFFSET(x) ((x) % 8) /* 8 bits/char */ +#define BMAP_SET(bmap, bit) ((bmap)[NODE_ARRAY_INDEX(bit)] |= 1 << NODE_ARRAY_OFFSET(bit)) +#define BMAP_TEST(bmap, bit) ((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit))) +#define MAX_PXM_DOMAINS 256 /* 1 byte and no promises about values */ +/* bitmap length; _PXM is at most 255 */ +#define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8) +static u8 pxm_bitmap[PXM_BITMAP_LEN]; /* bitmap of proximity domains */ + +#define MAX_CHUNKS_PER_NODE 4 +#define MAXCHUNKS (MAX_CHUNKS_PER_NODE * MAX_NUMNODES) +struct node_memory_chunk_s { + unsigned long start_pfn; + unsigned long end_pfn; + u8 pxm; // proximity domain of node + u8 nid; // which cnode contains this chunk? + u8 bank; // which mem bank on this node +}; +static struct node_memory_chunk_s node_memory_chunk[MAXCHUNKS]; + +static int num_memory_chunks; /* total number of memory chunks */ +static int zholes_size_init; +static unsigned long zholes_size[MAX_NUMNODES * MAX_NR_ZONES]; + +unsigned long node_start_pfn[MAX_NUMNODES]; +unsigned long node_end_pfn[MAX_NUMNODES]; + +extern void * boot_ioremap(unsigned long, unsigned long); + +/* Identify CPU proximity domains */ +static void __init parse_cpu_affinity_structure(char *p) +{ + struct acpi_table_processor_affinity *cpu_affinity = + (struct acpi_table_processor_affinity *) p; + + if (!cpu_affinity->flags.enabled) + return; /* empty entry */ + + /* mark this node as "seen" in node bitmap */ + BMAP_SET(pxm_bitmap, cpu_affinity->proximity_domain); + + printk("CPU 0x%02X in proximity domain 0x%02X\n", + cpu_affinity->apic_id, cpu_affinity->proximity_domain); +} + +/* + * Identify memory proximity domains and hot-remove capabilities. + * Fill node memory chunk list structure. + */ +static void __init parse_memory_affinity_structure (char *sratp) +{ + unsigned long long paddr, size; + unsigned long start_pfn, end_pfn; + u8 pxm; + struct node_memory_chunk_s *p, *q, *pend; + struct acpi_table_memory_affinity *memory_affinity = + (struct acpi_table_memory_affinity *) sratp; + + if (!memory_affinity->flags.enabled) + return; /* empty entry */ + + /* mark this node as "seen" in node bitmap */ + BMAP_SET(pxm_bitmap, memory_affinity->proximity_domain); + + /* calculate info for memory chunk structure */ + paddr = memory_affinity->base_addr_hi; + paddr = (paddr << 32) | memory_affinity->base_addr_lo; + size = memory_affinity->length_hi; + size = (size << 32) | memory_affinity->length_lo; + + start_pfn = paddr >> PAGE_SHIFT; + end_pfn = (paddr + size) >> PAGE_SHIFT; + + pxm = memory_affinity->proximity_domain; + + if (num_memory_chunks >= MAXCHUNKS) { + printk("Too many mem chunks in SRAT. Ignoring %lld MBytes at %llx\n", + size/(1024*1024), paddr); + return; + } + + /* Insertion sort based on base address */ + pend = &node_memory_chunk[num_memory_chunks]; + for (p = &node_memory_chunk[0]; p < pend; p++) { + if (start_pfn < p->start_pfn) + break; + } + if (p < pend) { + for (q = pend; q >= p; q--) + *(q + 1) = *q; + } + p->start_pfn = start_pfn; + p->end_pfn = end_pfn; + p->pxm = pxm; + + num_memory_chunks++; + + printk("Memory range 0x%lX to 0x%lX (type 0x%X) in proximity domain 0x%02X %s\n", + start_pfn, end_pfn, + memory_affinity->memory_type, + memory_affinity->proximity_domain, + (memory_affinity->flags.hot_pluggable ? + "enabled and removable" : "enabled" ) ); +} + +#if MAX_NR_ZONES != 3 +#error "MAX_NR_ZONES != 3, chunk_to_zone requires review" +#endif +/* Take a chunk of pages from page frame cstart to cend and count the number + * of pages in each zone, returned via zones[]. + */ +static __init void chunk_to_zones(unsigned long cstart, unsigned long cend, + unsigned long *zones) +{ + unsigned long max_dma; + extern unsigned long max_low_pfn; + + int z; + unsigned long rend; + + /* FIXME: MAX_DMA_ADDRESS and max_low_pfn are trying to provide + * similarly scoped information and should be handled in a consistant + * manner. + */ + max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; + + /* Split the hole into the zones in which it falls. Repeatedly + * take the segment in which the remaining hole starts, round it + * to the end of that zone. + */ + memset(zones, 0, MAX_NR_ZONES * sizeof(long)); + while (cstart < cend) { + if (cstart < max_dma) { + z = ZONE_DMA; + rend = (cend < max_dma)? cend : max_dma; + + } else if (cstart < max_low_pfn) { + z = ZONE_NORMAL; + rend = (cend < max_low_pfn)? cend : max_low_pfn; + + } else { + z = ZONE_HIGHMEM; + rend = cend; + } + zones[z] += rend - cstart; + cstart = rend; + } +} + +/* + * physnode_map keeps track of the physical memory layout of the + * numaq nodes on a 256Mb break (each element of the array will + * represent 256Mb of memory and will be marked by the node id. so, + * if the first gig is on node 0, and the second gig is on node 1 + * physnode_map will contain: + * physnode_map[0-3] = 0; + * physnode_map[4-7] = 1; + * physnode_map[8- ] = -1; + */ +int pfnnode_map[MAX_ELEMENTS] = { [0 ... (MAX_ELEMENTS - 1)] = -1}; +EXPORT_SYMBOL(pfnnode_map); + +static void __init initialize_pfnnode_map(void) +{ + unsigned long topofchunk, cur = 0; + int i; + + for (i = 0; i < num_memory_chunks; i++) { + cur = node_memory_chunk[i].start_pfn; + topofchunk = node_memory_chunk[i].end_pfn; + while (cur < topofchunk) { + pfnnode_map[PFN_TO_ELEMENT(cur)] = node_memory_chunk[i].nid; + cur ++; + } + } +} + +/* Parse the ACPI Static Resource Affinity Table */ +static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) +{ + u8 *start, *end, *p; + int i, j, nid; + u8 pxm_to_nid_map[MAX_PXM_DOMAINS];/* _PXM to logical node ID map */ + u8 nid_to_pxm_map[MAX_NUMNODES];/* logical node ID to _PXM map */ + + start = (u8 *)(&(sratp->reserved) + 1); /* skip header */ + p = start; + end = (u8 *)sratp + sratp->header.length; + + memset(pxm_bitmap, 0, sizeof(pxm_bitmap)); /* init proximity domain bitmap */ + memset(node_memory_chunk, 0, sizeof(node_memory_chunk)); + memset(zholes_size, 0, sizeof(zholes_size)); + + /* -1 in these maps means not available */ + memset(pxm_to_nid_map, -1, sizeof(pxm_to_nid_map)); + memset(nid_to_pxm_map, -1, sizeof(nid_to_pxm_map)); + + num_memory_chunks = 0; + while (p < end) { + switch (*p) { + case ACPI_SRAT_PROCESSOR_AFFINITY: + parse_cpu_affinity_structure(p); + break; + case ACPI_SRAT_MEMORY_AFFINITY: + parse_memory_affinity_structure(p); + break; + default: + printk("ACPI 2.0 SRAT: unknown entry skipped: type=0x%02X, len=%d\n", p[0], p[1]); + break; + } + p += p[1]; + if (p[1] == 0) { + printk("acpi20_parse_srat: Entry length value is zero;" + " can't parse any further!\n"); + break; + } + } + + /* Calculate total number of nodes in system from PXM bitmap and create + * a set of sequential node IDs starting at zero. (ACPI doesn't seem + * to specify the range of _PXM values.) + */ + numnodes = 0; /* init total nodes in system */ + for (i = 0; i < MAX_PXM_DOMAINS; i++) { + if (BMAP_TEST(pxm_bitmap, i)) { + pxm_to_nid_map[i] = numnodes; + nid_to_pxm_map[numnodes] = i; + node_set_online(numnodes); + ++numnodes; + } + } + + if (numnodes == 0) + BUG(); + + /* set cnode id in memory chunk structure */ + for (i = 0; i < num_memory_chunks; i++) + node_memory_chunk[i].nid = pxm_to_nid_map[node_memory_chunk[i].pxm]; + + initialize_pfnnode_map(); + + printk("pxm bitmap: "); + for (i = 0; i < sizeof(pxm_bitmap); i++) { + printk("%02X ", pxm_bitmap[i]); + } + printk("\n"); + printk("Number of logical nodes in system = %d\n", numnodes); + printk("Number of memory chunks in system = %d\n", num_memory_chunks); + + for (j = 0; j < num_memory_chunks; j++){ + printk("chunk %d nid %d start_pfn %08lx end_pfn %08lx\n", + j, node_memory_chunk[j].nid, + node_memory_chunk[j].start_pfn, + node_memory_chunk[j].end_pfn); + } + + /*calculate node_start_pfn/node_end_pfn arrays*/ + for (nid = 0; nid < numnodes; nid++) { + int been_here_before = 0; + + for (j = 0; j < num_memory_chunks; j++){ + if (node_memory_chunk[j].nid == nid) { + if (been_here_before == 0) { + node_start_pfn[nid] = node_memory_chunk[j].start_pfn; + node_end_pfn[nid] = node_memory_chunk[j].end_pfn; + been_here_before = 1; + } else { /* We've found another chunk of memory for the node */ + if (node_start_pfn[nid] < node_memory_chunk[j].start_pfn) { + node_end_pfn[nid] = node_memory_chunk[j].end_pfn; + } + } + } + } + } + return 0; +} + +void __init get_memcfg_from_srat(void) +{ + struct acpi_table_header *header = NULL; + struct acpi_table_rsdp *rsdp = NULL; + struct acpi_table_rsdt *rsdt = NULL; + struct acpi_pointer *rsdp_address = NULL; + struct acpi_table_rsdt saved_rsdt; + int tables = 0; + int i = 0; + + acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING, rsdp_address); + + if (rsdp_address->pointer_type == ACPI_PHYSICAL_POINTER) { + printk("%s: assigning address to rsdp\n", __FUNCTION__); + rsdp = (struct acpi_table_rsdp *)rsdp_address->pointer.physical; + } else { + printk("%s: rsdp_address is not a physical pointer\n", __FUNCTION__); + return; + } + if (!rsdp) { + printk("%s: Didn't find ACPI root!\n", __FUNCTION__); + return; + } + + printk(KERN_INFO "%.8s v%d [%.6s]\n", rsdp->signature, rsdp->revision, + rsdp->oem_id); + + if (strncmp(rsdp->signature, RSDP_SIG,strlen(RSDP_SIG))) { + printk(KERN_WARNING "%s: RSDP table signature incorrect\n", __FUNCTION__); + return; + } + + rsdt = (struct acpi_table_rsdt *) + boot_ioremap(rsdp->rsdt_address, sizeof(struct acpi_table_rsdt)); + + if (!rsdt) { + printk(KERN_WARNING + "%s: ACPI: Invalid root system description tables (RSDT)\n", + __FUNCTION__); + return; + } + + header = & rsdt->header; + + if (strncmp(header->signature, RSDT_SIG, strlen(RSDT_SIG))) { + printk(KERN_WARNING "ACPI: RSDT signature incorrect\n"); + return; + } + + /* + * The number of tables is computed by taking the + * size of all entries (header size minus total + * size of RSDT) divided by the size of each entry + * (4-byte table pointers). + */ + tables = (header->length - sizeof(struct acpi_table_header)) / 4; + + memcpy(&saved_rsdt, rsdt, sizeof(saved_rsdt)); + + if (saved_rsdt.header.length > sizeof(saved_rsdt)) { + printk(KERN_WARNING "ACPI: Too big length in RSDT: %d\n", + saved_rsdt.header.length); + return; + } + +printk("Begin table scan....\n"); + + for (i = 0; i < tables; i++) { + /* Map in header, then map in full table length. */ + header = (struct acpi_table_header *) + boot_ioremap(saved_rsdt.entry[i], sizeof(struct acpi_table_header)); + if (!header) + break; + header = (struct acpi_table_header *) + boot_ioremap(saved_rsdt.entry[i], header->length); + if (!header) + break; + + if (strncmp((char *) &header->signature, "SRAT", 4)) + continue; + acpi20_parse_srat((struct acpi_table_srat *)header); + /* we've found the srat table. don't need to look at any more tables */ + break; + } +} + +/* For each node run the memory list to determine whether there are + * any memory holes. For each hole determine which ZONE they fall + * into. + * + * NOTE#1: this requires knowledge of the zone boundries and so + * _cannot_ be performed before those are calculated in setup_memory. + * + * NOTE#2: we rely on the fact that the memory chunks are ordered by + * start pfn number during setup. + */ +static void __init get_zholes_init(void) +{ + int nid; + int c; + int first; + unsigned long end = 0; + + for (nid = 0; nid < numnodes; nid++) { + first = 1; + for (c = 0; c < num_memory_chunks; c++){ + if (node_memory_chunk[c].nid == nid) { + if (first) { + end = node_memory_chunk[c].end_pfn; + first = 0; + + } else { + /* Record any gap between this chunk + * and the previous chunk on this node + * against the zones it spans. + */ + chunk_to_zones(end, + node_memory_chunk[c].start_pfn, + &zholes_size[nid * MAX_NR_ZONES]); + } + } + } + } +} + +unsigned long * __init get_zholes_size(int nid) +{ + if (!zholes_size_init) { + zholes_size_init++; + get_zholes_init(); + } + if((nid >= numnodes) | (nid >= MAX_NUMNODES)) + printk("%s: nid = %d is invalid. numnodes = %d", + __FUNCTION__, nid, numnodes); + return &zholes_size[nid * MAX_NR_ZONES]; +} diff -Nru a/arch/i386/kernel/suspend.c b/arch/i386/kernel/suspend.c --- a/arch/i386/kernel/suspend.c Thu Feb 27 01:44:27 2003 +++ b/arch/i386/kernel/suspend.c Thu Feb 27 01:44:27 2003 @@ -113,7 +113,7 @@ int cpu = smp_processor_id(); struct tss_struct * t = init_tss + cpu; - set_tss_desc(cpu,t); /* This just modifies memory; should not be neccessary. But... This is neccessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ + set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff; load_TR_desc(); /* This does ltr */ diff -Nru a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c --- a/arch/i386/kernel/time.c Thu Feb 27 01:44:23 2003 +++ b/arch/i386/kernel/time.c Thu Feb 27 01:44:23 2003 @@ -66,7 +66,7 @@ #include "do_timer.h" -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; unsigned long cpu_khz; /* Detected as we calibrate the TSC */ diff -Nru a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c --- a/arch/i386/kernel/timers/timer_tsc.c Thu Feb 27 01:44:26 2003 +++ b/arch/i386/kernel/timers/timer_tsc.c Thu Feb 27 01:44:26 2003 @@ -264,7 +264,7 @@ * the ident/bugs checks so we must run this hook as it * may turn off the TSC flag. * - * NOTE: this doesnt yet handle SMP 486 machines where only + * NOTE: this doesn't yet handle SMP 486 machines where only * some CPU's have a TSC. Thats never worked and nobody has * moaned if you have the only one in the world - you fix it! */ diff -Nru a/arch/i386/lib/mmx.c b/arch/i386/lib/mmx.c --- a/arch/i386/lib/mmx.c Thu Feb 27 01:44:23 2003 +++ b/arch/i386/lib/mmx.c Thu Feb 27 01:44:23 2003 @@ -15,7 +15,7 @@ * (reported so on K6-III) * We should use a better code neutral filler for the short jump * leal ebx. [ebx] is apparently best for K6-2, but Cyrix ?? - * We also want to clobber the filler register so we dont get any + * We also want to clobber the filler register so we don't get any * register forwarding stalls on the filler. * * Add *user handling. Checksums are not a win with MMX on any CPU diff -Nru a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c --- a/arch/i386/mach-visws/visws_apic.c Thu Feb 27 01:44:17 2003 +++ b/arch/i386/mach-visws/visws_apic.c Thu Feb 27 01:44:17 2003 @@ -190,7 +190,7 @@ * the 'master' interrupt source: CO_IRQ_8259. * * When the 8259 interrupts its handler figures out which of these - * devices is interrupting and dispatches to it's handler. + * devices is interrupting and dispatches to its handler. * * CAREFUL: devices see the 'virtual' interrupt only. Thus disable/ * enable_irq gets the right irq. This 'master' irq is never directly diff -Nru a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c --- a/arch/i386/mach-voyager/voyager_smp.c Thu Feb 27 01:44:22 2003 +++ b/arch/i386/mach-voyager/voyager_smp.c Thu Feb 27 01:44:22 2003 @@ -1230,9 +1230,10 @@ void flush_tlb_all(void) { + preempt_disable(); smp_call_function (flush_tlb_all_function, 0, 1, 1); - do_flush_tlb_all_local(); + preempt_enable(); } /* used to set up the trampoline for other CPUs when the memory manager @@ -1453,7 +1454,7 @@ } /* send a CPI at level cpi to a set of cpus in cpuset (set 1 bit per - * processor to recieve CPI */ + * processor to receive CPI */ static void send_CPI(__u32 cpuset, __u8 cpi) { diff -Nru a/arch/i386/mm/Makefile b/arch/i386/mm/Makefile --- a/arch/i386/mm/Makefile Thu Feb 27 01:44:20 2003 +++ b/arch/i386/mm/Makefile Thu Feb 27 01:44:20 2003 @@ -2,8 +2,9 @@ # Makefile for the linux i386-specific parts of the memory manager. # -obj-y := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o +obj-y := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o obj-$(CONFIG_DISCONTIGMEM) += discontig.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_HIGHMEM) += highmem.o +obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap.o diff -Nru a/arch/i386/mm/boot_ioremap.c b/arch/i386/mm/boot_ioremap.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/i386/mm/boot_ioremap.c Thu Feb 27 01:44:31 2003 @@ -0,0 +1,94 @@ +/* + * arch/i386/mm/boot_ioremap.c + * + * Re-map functions for early boot-time before paging_init() when the + * boot-time pagetables are still in use + * + * Written by Dave Hansen + */ + + +/* + * We need to use the 2-level pagetable functions, but CONFIG_X86_PAE + * keeps that from happenning. If anyone has a better way, I'm listening. + * + * boot_pte_t is defined only if this all works correctly + */ + +#include +#undef CONFIG_X86_PAE +#include +#include +#include +#include + +/* + * I'm cheating here. It is known that the two boot PTE pages are + * allocated next to each other. I'm pretending that they're just + * one big array. + */ + +#define BOOT_PTE_PTRS (PTRS_PER_PTE*2) +#define boot_pte_index(address) \ + (((address) >> PAGE_SHIFT) & (BOOT_PTE_PTRS - 1)) + +static inline boot_pte_t* boot_vaddr_to_pte(void *address) +{ + boot_pte_t* boot_pg = (boot_pte_t*)pg0; + return &boot_pg[boot_pte_index((unsigned long)address)]; +} + +/* + * This is only for a caller who is clever enough to page-align + * phys_addr and virtual_source, and who also has a preference + * about which virtual address from which to steal ptes + */ +static void __boot_ioremap(unsigned long phys_addr, unsigned long nrpages, + void* virtual_source) +{ + boot_pte_t* pte; + int i; + + pte = boot_vaddr_to_pte(virtual_source); + for (i=0; i < nrpages; i++, phys_addr += PAGE_SIZE, pte++) { + set_pte(pte, pfn_pte(phys_addr>>PAGE_SHIFT, PAGE_KERNEL)); + } +} + +/* the virtual space we're going to remap comes from this array */ +#define BOOT_IOREMAP_PAGES 4 +#define BOOT_IOREMAP_SIZE (BOOT_IOREMAP_PAGES*PAGE_SIZE) +__initdata char boot_ioremap_space[BOOT_IOREMAP_SIZE] + __attribute__ ((aligned (PAGE_SIZE))); + +/* + * This only applies to things which need to ioremap before paging_init() + * bt_ioremap() and plain ioremap() are both useless at this point. + * + * When used, we're still using the boot-time pagetables, which only + * have 2 PTE pages mapping the first 8MB + * + * There is no unmap. The boot-time PTE pages aren't used after boot. + * If you really want the space back, just remap it yourself. + * boot_ioremap(&ioremap_space-PAGE_OFFSET, BOOT_IOREMAP_SIZE) + */ +__init void* boot_ioremap(unsigned long phys_addr, unsigned long size) +{ + unsigned long last_addr, offset; + unsigned int nrpages; + + last_addr = phys_addr + size - 1; + + /* page align the requested address */ + offset = phys_addr & ~PAGE_MASK; + phys_addr &= PAGE_MASK; + size = PAGE_ALIGN(last_addr) - phys_addr; + + nrpages = size >> PAGE_SHIFT; + if (nrpages > BOOT_IOREMAP_PAGES) + return NULL; + + __boot_ioremap(phys_addr, nrpages, boot_ioremap_space); + + return &boot_ioremap_space[offset]; +} diff -Nru a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c --- a/arch/i386/mm/discontig.c Thu Feb 27 01:44:24 2003 +++ b/arch/i386/mm/discontig.c Thu Feb 27 01:44:24 2003 @@ -284,6 +284,7 @@ for (nid = 0; nid < numnodes; nid++) { unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long *zholes_size; unsigned int max_dma; unsigned long low = max_low_pfn; @@ -307,6 +308,7 @@ #endif } } + zholes_size = get_zholes_size(nid); /* * We let the lmem_map for node 0 be allocated from the * normal bootmem allocator, but other nodes come from the @@ -315,10 +317,10 @@ if (nid) free_area_init_node(nid, NODE_DATA(nid), node_remap_start_vaddr[nid], zones_size, - start, 0); + start, zholes_size); else free_area_init_node(nid, NODE_DATA(nid), 0, - zones_size, start, 0); + zones_size, start, zholes_size); } return; } diff -Nru a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c --- a/arch/i386/mm/hugetlbpage.c Thu Feb 27 01:44:30 2003 +++ b/arch/i386/mm/hugetlbpage.c Thu Feb 27 01:44:30 2003 @@ -29,6 +29,8 @@ static LIST_HEAD(htlbpage_freelist); static spinlock_t htlbpage_lock = SPIN_LOCK_UNLOCKED; +void free_huge_page(struct page *page); + static struct page *alloc_hugetlb_page(void) { int i; @@ -45,7 +47,7 @@ htlbpagemem--; spin_unlock(&htlbpage_lock); set_page_count(page, 1); - page->lru.prev = (void *)huge_page_release; + page->lru.prev = (void *)free_huge_page; for (i = 0; i < (HPAGE_SIZE/PAGE_SIZE); ++i) clear_highpage(&page[i]); return page; diff -Nru a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c --- a/arch/i386/mm/ioremap.c Thu Feb 27 01:44:20 2003 +++ b/arch/i386/mm/ioremap.c Thu Feb 27 01:44:20 2003 @@ -205,6 +205,7 @@ iounmap(p); p = NULL; } + global_flush_tlb(); } return p; @@ -226,6 +227,7 @@ change_page_attr(virt_to_page(__va(p->phys_addr)), p->size >> PAGE_SHIFT, PAGE_KERNEL); + global_flush_tlb(); } kfree(p); } diff -Nru a/arch/i386/pci/visws.c b/arch/i386/pci/visws.c --- a/arch/i386/pci/visws.c Thu Feb 27 01:44:27 2003 +++ b/arch/i386/pci/visws.c Thu Feb 27 01:44:27 2003 @@ -52,7 +52,7 @@ pin--; - /* Nothing usefull at PIIX4 pin 1 */ + /* Nothing useful at PIIX4 pin 1 */ if (bus == pci_bus0 && slot == 4 && pin == 0) return -1; diff -Nru a/arch/ia64/ia32/ia32_signal.c b/arch/ia64/ia32/ia32_signal.c --- a/arch/ia64/ia32/ia32_signal.c Thu Feb 27 01:44:17 2003 +++ b/arch/ia64/ia32/ia32_signal.c Thu Feb 27 01:44:17 2003 @@ -338,7 +338,7 @@ /* * Updating fsr, fcr, fir, fdr. * Just a bit more complicated than save. - * - Need to make sure that we dont write any value other than the + * - Need to make sure that we don't write any value other than the * specific fpstate info * - Need to make sure that the untouched part of frs, fdr, fir, fcr * should remain same while writing. diff -Nru a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c --- a/arch/ia64/kernel/irq.c Thu Feb 27 01:44:28 2003 +++ b/arch/ia64/kernel/irq.c Thu Feb 27 01:44:28 2003 @@ -104,7 +104,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ #if CONFIG_X86 diff -Nru a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h --- a/arch/ia64/kernel/minstate.h Thu Feb 27 01:44:28 2003 +++ b/arch/ia64/kernel/minstate.h Thu Feb 27 01:44:28 2003 @@ -26,7 +26,7 @@ */ /* - * For ivt.s we want to access the stack virtually so we dont have to disable translation + * For ivt.s we want to access the stack virtually so we don't have to disable translation * on interrupts. */ #define MINSTATE_START_SAVE_MIN_VIRT \ @@ -52,7 +52,7 @@ /* * For mca_asm.S we want to access the stack physically since the state is saved before we - * go virtual and dont want to destroy the iip or ipsr. + * go virtual and don't want to destroy the iip or ipsr. */ #define MINSTATE_START_SAVE_MIN_PHYS \ (pKStk) movl sp=ia64_init_stack+IA64_STK_OFFSET-IA64_PT_REGS_SIZE; \ diff -Nru a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c --- a/arch/ia64/kernel/perfmon.c Thu Feb 27 01:44:30 2003 +++ b/arch/ia64/kernel/perfmon.c Thu Feb 27 01:44:30 2003 @@ -718,7 +718,7 @@ /* * counts the number of PMDS to save per entry. - * This code is generic enough to accomodate more than 64 PMDS when they become available + * This code is generic enough to accommodate more than 64 PMDS when they become available */ static unsigned long pfm_smpl_entry_size(unsigned long *which, unsigned long size) diff -Nru a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c --- a/arch/ia64/kernel/time.c Thu Feb 27 01:44:20 2003 +++ b/arch/ia64/kernel/time.c Thu Feb 27 01:44:20 2003 @@ -27,7 +27,7 @@ extern unsigned long wall_jiffies; extern unsigned long last_time_offset; -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; #ifdef CONFIG_IA64_DEBUG_IRQ diff -Nru a/arch/ia64/lib/checksum.c b/arch/ia64/lib/checksum.c --- a/arch/ia64/lib/checksum.c Thu Feb 27 01:44:28 2003 +++ b/arch/ia64/lib/checksum.c Thu Feb 27 01:44:28 2003 @@ -50,7 +50,7 @@ ((unsigned long) ntohs(len) << 16) + ((unsigned long) proto << 8)); - /* Fold down to 32-bits so we don't loose in the typedef-less network stack. */ + /* Fold down to 32-bits so we don't lose in the typedef-less network stack. */ /* 64 to 33 */ result = (result & 0xffffffff) + (result >> 32); /* 33 to 32 */ diff -Nru a/arch/ia64/lib/do_csum.S b/arch/ia64/lib/do_csum.S --- a/arch/ia64/lib/do_csum.S Thu Feb 27 01:44:19 2003 +++ b/arch/ia64/lib/do_csum.S Thu Feb 27 01:44:19 2003 @@ -41,7 +41,7 @@ // into one 8 byte word. In this case we have only one entry in the pipeline. // // We use a (LOAD_LATENCY+2)-stage pipeline in the loop to account for -// possible load latency and also to accomodate for head and tail. +// possible load latency and also to accommodate for head and tail. // // The end of the function deals with folding the checksum from 64bits // down to 16bits taking care of the carry. diff -Nru a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c --- a/arch/ia64/lib/swiotlb.c Thu Feb 27 01:44:27 2003 +++ b/arch/ia64/lib/swiotlb.c Thu Feb 27 01:44:27 2003 @@ -359,7 +359,7 @@ * was provided for in a previous swiotlb_map_single call. All other usages are * undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see whatever the + * After this call, reads by the cpu to the buffer are guaranteed to see whatever the * device wrote there. */ void diff -Nru a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c --- a/arch/ia64/mm/discontig.c Thu Feb 27 01:44:28 2003 +++ b/arch/ia64/mm/discontig.c Thu Feb 27 01:44:28 2003 @@ -241,7 +241,7 @@ * - build the nodedir for the node. This contains pointers to * the per-bank mem_map entries. * - fix the page struct "virtual" pointers. These are bank specific - * values that the paging system doesnt understand. + * values that the paging system doesn't understand. * - replicate the nodedir structure to other nodes */ diff -Nru a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c --- a/arch/ia64/mm/hugetlbpage.c Thu Feb 27 01:44:23 2003 +++ b/arch/ia64/mm/hugetlbpage.c Thu Feb 27 01:44:23 2003 @@ -26,6 +26,8 @@ static LIST_HEAD(htlbpage_freelist); static spinlock_t htlbpage_lock = SPIN_LOCK_UNLOCKED; +void free_huge_page(struct page *page); + static struct page *alloc_hugetlb_page(void) { int i; @@ -42,6 +44,7 @@ htlbpagemem--; spin_unlock(&htlbpage_lock); set_page_count(page, 1); + page->lru.prev = (void *)free_huge_page; for (i = 0; i < (HPAGE_SIZE/PAGE_SIZE); ++i) clear_highpage(&page[i]); return page; diff -Nru a/arch/ia64/sn/fakeprom/fpmem.c b/arch/ia64/sn/fakeprom/fpmem.c --- a/arch/ia64/sn/fakeprom/fpmem.c Thu Feb 27 01:44:22 2003 +++ b/arch/ia64/sn/fakeprom/fpmem.c Thu Feb 27 01:44:22 2003 @@ -218,7 +218,7 @@ } /* - * Check for the node 0 hole. Since banks cant + * Check for the node 0 hole. Since banks can't * span the hole, we only need to check if the end of * the range is the end of the hole. */ @@ -226,7 +226,7 @@ numbytes -= NODE0_HOLE_SIZE; /* * UGLY hack - we must skip overr the kernel and - * PROM runtime services but we dont exactly where it is. + * PROM runtime services but we don't exactly where it is. * So lets just reserve: * node 0 * 0-1MB for PAL diff -Nru a/arch/ia64/sn/fakeprom/fw-emu.c b/arch/ia64/sn/fakeprom/fw-emu.c --- a/arch/ia64/sn/fakeprom/fw-emu.c Thu Feb 27 01:44:27 2003 +++ b/arch/ia64/sn/fakeprom/fw-emu.c Thu Feb 27 01:44:27 2003 @@ -757,7 +757,7 @@ sal_systab->checksum = -checksum; /* If the checksum is correct, the kernel tries to use the - * table. We dont build enough table & the kernel aborts. + * table. We don't build enough table & the kernel aborts. * Note that the PROM hasd thhhe same problem!! */ diff -Nru a/arch/ia64/sn/io/hcl.c b/arch/ia64/sn/io/hcl.c --- a/arch/ia64/sn/io/hcl.c Thu Feb 27 01:44:27 2003 +++ b/arch/ia64/sn/io/hcl.c Thu Feb 27 01:44:27 2003 @@ -467,7 +467,7 @@ /* * We need to clean up! */ - printk(KERN_WARNING "HCL: Unable to set the connect point to it's parent 0x%p\n", + printk(KERN_WARNING "HCL: Unable to set the connect point to its parent 0x%p\n", (void *)new_devfs_handle); } diff -Nru a/arch/ia64/sn/io/sn1/pcibr.c b/arch/ia64/sn/io/sn1/pcibr.c --- a/arch/ia64/sn/io/sn1/pcibr.c Thu Feb 27 01:44:25 2003 +++ b/arch/ia64/sn/io/sn1/pcibr.c Thu Feb 27 01:44:26 2003 @@ -2647,7 +2647,7 @@ /* * The Adaptec 1160 FC Controller WAR #767995: * The part incorrectly ignores the upper 32 bits of a 64 bit - * address when decoding references to it's registers so to + * address when decoding references to its registers so to * keep it from responding to a bus cycle that it shouldn't * we only use I/O space to get at it's registers. Don't * enable memory space accesses on that PCI device. @@ -5113,7 +5113,7 @@ /* Bridge Hardware Bug WAR #484930: * Bridge can't handle updating External ATEs - * while DMA is occuring that uses External ATEs, + * while DMA is occurring that uses External ATEs, * even if the particular ATEs involved are disjoint. */ @@ -6844,7 +6844,7 @@ * * This is the pcibr interrupt "wrapper" function that is called, * in interrupt context, to initiate the interrupt handler(s) registered - * (via pcibr_intr_alloc/connect) for the occuring interrupt. Non-threaded + * (via pcibr_intr_alloc/connect) for the occurring interrupt. Non-threaded * handlers will be called directly, and threaded handlers will have their * thread woken up. */ diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c Thu Feb 27 01:44:17 2003 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c Thu Feb 27 01:44:17 2003 @@ -362,7 +362,7 @@ /* Bridge Hardware Bug WAR #484930: * Bridge can't handle updating External ATEs - * while DMA is occuring that uses External ATEs, + * while DMA is occurring that uses External ATEs, * even if the particular ATEs involved are disjoint. */ diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c Thu Feb 27 01:44:31 2003 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c Thu Feb 27 01:44:31 2003 @@ -849,7 +849,7 @@ * will set the c_slot (which is suppose to represent the external * slot (i.e the slot number silk screened on the back of the I/O * brick)). So for PIC we need to adjust this "internal slot" num - * passed into us, into it's external representation. See comment + * passed into us, into its external representation. See comment * for the PCIBR_DEVICE_TO_SLOT macro for more information. */ NEW(pcibr_info); @@ -1527,7 +1527,7 @@ /* enable parity checking on PICs internal RAM */ pic_ctrl_reg |= PIC_CTRL_PAR_EN_RESP; pic_ctrl_reg |= PIC_CTRL_PAR_EN_ATE; - /* PIC BRINGUP WAR (PV# 862253): dont enable write request + /* PIC BRINGUP WAR (PV# 862253): don't enable write request * parity checking. */ if (!PCIBR_WAR_ENABLED(PV862253, pcibr_soft)) { diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c Thu Feb 27 01:44:17 2003 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c Thu Feb 27 01:44:17 2003 @@ -1806,7 +1806,7 @@ * * CAUTION: Resetting bit BRIDGE_IRR_PCI_GRP_CLR, acknowledges * a group of interrupts. If while handling this error, - * some other error has occured, that would be + * some other error has occurred, that would be * implicitly cleared by this write. * Need a way to ensure we don't inadvertently clear some * other errors. diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Thu Feb 27 01:44:27 2003 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Thu Feb 27 01:44:27 2003 @@ -842,7 +842,7 @@ * * This is the pcibr interrupt "wrapper" function that is called, * in interrupt context, to initiate the interrupt handler(s) registered - * (via pcibr_intr_alloc/connect) for the occuring interrupt. Non-threaded + * (via pcibr_intr_alloc/connect) for the occurring interrupt. Non-threaded * handlers will be called directly, and threaded handlers will have their * thread woken up. */ diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c Thu Feb 27 01:44:23 2003 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c Thu Feb 27 01:44:23 2003 @@ -803,7 +803,7 @@ * 'min_gnt' and attempt to calculate a latency time. * * NOTE: For now if the device is on the 'real time' arbitration - * ring we dont set the latency timer. + * ring we don't set the latency timer. * * WAR: SGI's IOC3 and RAD devices target abort if you write a * single byte into their config space. So don't set the Latency @@ -852,7 +852,7 @@ } /* Get the PCI-X capability if running in PCI-X mode. If the func - * doesnt have a pcix capability, allocate a PCIIO_VENDOR_ID_NONE + * doesn't have a pcix capability, allocate a PCIIO_VENDOR_ID_NONE * pcibr_info struct so the device driver for that function is not * called. */ @@ -1449,7 +1449,7 @@ /* * The Adaptec 1160 FC Controller WAR #767995: * The part incorrectly ignores the upper 32 bits of a 64 bit - * address when decoding references to it's registers so to + * address when decoding references to its registers so to * keep it from responding to a bus cycle that it shouldn't * we only use I/O space to get at it's registers. Don't * enable memory space accesses on that PCI device. diff -Nru a/arch/ia64/sn/kernel/llsc4.c b/arch/ia64/sn/kernel/llsc4.c --- a/arch/ia64/sn/kernel/llsc4.c Thu Feb 27 01:44:27 2003 +++ b/arch/ia64/sn/kernel/llsc4.c Thu Feb 27 01:44:27 2003 @@ -301,7 +301,7 @@ */ linei = randn(linecount, &seed); sharei = randn(2, &seed); - slinei = (linei + (linecount/2))%linecount; /* I dont like this - fix later */ + slinei = (linei + (linecount/2))%linecount; /* I don't like this - fix later */ linep = (dataline_t *)blocks[linei]; slinep = (dataline_t *)blocks[slinei]; diff -Nru a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c --- a/arch/ia64/sn/kernel/setup.c Thu Feb 27 01:44:20 2003 +++ b/arch/ia64/sn/kernel/setup.c Thu Feb 27 01:44:20 2003 @@ -153,7 +153,7 @@ /** * early_sn_setup - early setup routine for SN platforms * - * Sets up an intial console to aid debugging. Intended primarily + * Sets up an initial console to aid debugging. Intended primarily * for bringup, it's only called if %BRINGUP and %CONFIG_IA64_EARLY_PRINTK * are turned on. See start_kernel() in init/main.c. */ @@ -172,7 +172,7 @@ /* * Parse enough of the SAL tables to locate the SAL entry point. Since, console - * IO on SN2 is done via SAL calls, early_printk wont work without this. + * IO on SN2 is done via SAL calls, early_printk won't work without this. * * This code duplicates some of the ACPI table parsing that is in efi.c & sal.c. * Any changes to those file may have to be made hereas well. diff -Nru a/arch/ia64/sn/kernel/sn1/sn1_smp.c b/arch/ia64/sn/kernel/sn1/sn1_smp.c --- a/arch/ia64/sn/kernel/sn1/sn1_smp.c Thu Feb 27 01:44:22 2003 +++ b/arch/ia64/sn/kernel/sn1/sn1_smp.c Thu Feb 27 01:44:22 2003 @@ -100,7 +100,7 @@ /* * The following table/struct is for remembering PTC coherency domains. It - * is also used to translate sapicid into cpuids. We dont want to start + * is also used to translate sapicid into cpuids. We don't want to start * cpus unless we know their cache domain. */ #ifdef PTC_NOTYET diff -Nru a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c Thu Feb 27 01:44:30 2003 +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c Thu Feb 27 01:44:30 2003 @@ -395,7 +395,7 @@ mycnode = local_nodeid; /* - * For now, we dont want to spin uninterruptibly waiting + * For now, we don't want to spin uninterruptibly waiting * for the lock. Makes hangs hard to debug. */ local_irq_save(flags); @@ -506,7 +506,7 @@ pio_phys_write_mmr(p, val); #ifndef CONFIG_SHUB_1_0_SPECIFIC - /* doesnt work on shub 1.0 */ + /* doesn't work on shub 1.0 */ wait_piowc(); #endif } diff -Nru a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S --- a/arch/m68k/ifpsp060/src/fpsp.S Thu Feb 27 01:44:30 2003 +++ b/arch/m68k/ifpsp060/src/fpsp.S Thu Feb 27 01:44:30 2003 @@ -2201,7 +2201,7 @@ mov.l LOCAL_SIZE+2+EXC_PC(%sp),LOCAL_SIZE+2+EXC_PC-0xc(%sp) mov.l LOCAL_SIZE+EXC_EA(%sp),LOCAL_SIZE+EXC_EA-0xc(%sp) -# now, we copy the default result to it's proper location +# now, we copy the default result to its proper location mov.l LOCAL_SIZE+FP_DST_EX(%sp),LOCAL_SIZE+0x4(%sp) mov.l LOCAL_SIZE+FP_DST_HI(%sp),LOCAL_SIZE+0x8(%sp) mov.l LOCAL_SIZE+FP_DST_LO(%sp),LOCAL_SIZE+0xc(%sp) @@ -2241,7 +2241,7 @@ mov.l LOCAL_SIZE+2+EXC_PC(%sp),LOCAL_SIZE+2+EXC_PC-0xc(%sp) mov.l LOCAL_SIZE+EXC_EA(%sp),LOCAL_SIZE+EXC_EA-0xc(%sp) -# now, we copy the default result to it's proper location +# now, we copy the default result to its proper location mov.l LOCAL_SIZE+FP_DST_EX(%sp),LOCAL_SIZE+0x4(%sp) mov.l LOCAL_SIZE+FP_DST_HI(%sp),LOCAL_SIZE+0x8(%sp) mov.l LOCAL_SIZE+FP_DST_LO(%sp),LOCAL_SIZE+0xc(%sp) @@ -2281,7 +2281,7 @@ mov.l LOCAL_SIZE+2+EXC_PC(%sp),LOCAL_SIZE+2+EXC_PC-0xc(%sp) mov.l LOCAL_SIZE+EXC_EA(%sp),LOCAL_SIZE+EXC_EA-0xc(%sp) -# now, we copy the default result to it's proper location +# now, we copy the default result to its proper location mov.l LOCAL_SIZE+FP_DST_EX(%sp),LOCAL_SIZE+0x4(%sp) mov.l LOCAL_SIZE+FP_DST_HI(%sp),LOCAL_SIZE+0x8(%sp) mov.l LOCAL_SIZE+FP_DST_LO(%sp),LOCAL_SIZE+0xc(%sp) diff -Nru a/arch/m68k/ifpsp060/src/isp.S b/arch/m68k/ifpsp060/src/isp.S --- a/arch/m68k/ifpsp060/src/isp.S Thu Feb 27 01:44:20 2003 +++ b/arch/m68k/ifpsp060/src/isp.S Thu Feb 27 01:44:20 2003 @@ -843,7 +843,7 @@ bra.l _real_access # if the addressing mode was (an)+ or -(an), the address register must -# be restored to it's pre-exception value before entering _real_access. +# be restored to its pre-exception value before entering _real_access. isp_restore: cmpi.b SPCOND_FLG(%a6),&restore_flg # do we need a restore? bne.b isp_restore_done # no diff -Nru a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S --- a/arch/m68k/ifpsp060/src/pfpsp.S Thu Feb 27 01:44:18 2003 +++ b/arch/m68k/ifpsp060/src/pfpsp.S Thu Feb 27 01:44:18 2003 @@ -2200,7 +2200,7 @@ mov.l LOCAL_SIZE+2+EXC_PC(%sp),LOCAL_SIZE+2+EXC_PC-0xc(%sp) mov.l LOCAL_SIZE+EXC_EA(%sp),LOCAL_SIZE+EXC_EA-0xc(%sp) -# now, we copy the default result to it's proper location +# now, we copy the default result to its proper location mov.l LOCAL_SIZE+FP_DST_EX(%sp),LOCAL_SIZE+0x4(%sp) mov.l LOCAL_SIZE+FP_DST_HI(%sp),LOCAL_SIZE+0x8(%sp) mov.l LOCAL_SIZE+FP_DST_LO(%sp),LOCAL_SIZE+0xc(%sp) @@ -2240,7 +2240,7 @@ mov.l LOCAL_SIZE+2+EXC_PC(%sp),LOCAL_SIZE+2+EXC_PC-0xc(%sp) mov.l LOCAL_SIZE+EXC_EA(%sp),LOCAL_SIZE+EXC_EA-0xc(%sp) -# now, we copy the default result to it's proper location +# now, we copy the default result to its proper location mov.l LOCAL_SIZE+FP_DST_EX(%sp),LOCAL_SIZE+0x4(%sp) mov.l LOCAL_SIZE+FP_DST_HI(%sp),LOCAL_SIZE+0x8(%sp) mov.l LOCAL_SIZE+FP_DST_LO(%sp),LOCAL_SIZE+0xc(%sp) @@ -2280,7 +2280,7 @@ mov.l LOCAL_SIZE+2+EXC_PC(%sp),LOCAL_SIZE+2+EXC_PC-0xc(%sp) mov.l LOCAL_SIZE+EXC_EA(%sp),LOCAL_SIZE+EXC_EA-0xc(%sp) -# now, we copy the default result to it's proper location +# now, we copy the default result to its proper location mov.l LOCAL_SIZE+FP_DST_EX(%sp),LOCAL_SIZE+0x4(%sp) mov.l LOCAL_SIZE+FP_DST_HI(%sp),LOCAL_SIZE+0x8(%sp) mov.l LOCAL_SIZE+FP_DST_LO(%sp),LOCAL_SIZE+0xc(%sp) diff -Nru a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S --- a/arch/m68k/kernel/head.S Thu Feb 27 01:44:31 2003 +++ b/arch/m68k/kernel/head.S Thu Feb 27 01:44:31 2003 @@ -3127,7 +3127,7 @@ moveb %d0,M162_SCC_CTRL_A jra 3f 5: - /* 166/167/177; its a CD2401 */ + /* 166/167/177; it's a CD2401 */ moveb #0,M167_CYCAR moveb M167_CYIER,%d2 moveb #0x02,M167_CYIER diff -Nru a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c --- a/arch/m68k/kernel/time.c Thu Feb 27 01:44:20 2003 +++ b/arch/m68k/kernel/time.c Thu Feb 27 01:44:20 2003 @@ -26,7 +26,7 @@ #include #include -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static inline int set_rtc_mmss(unsigned long nowtime) { diff -Nru a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S --- a/arch/m68k/math-emu/fp_util.S Thu Feb 27 01:44:30 2003 +++ b/arch/m68k/math-emu/fp_util.S Thu Feb 27 01:44:30 2003 @@ -49,7 +49,7 @@ * is currently at that time unused, be careful if you want change * something here. %d0 and %d1 is always usable, sometimes %d2 (or * only the lower half) most function have to return the %a0 - * unmodified, so that the caller can immediatly reuse it. + * unmodified, so that the caller can immediately reuse it. */ .globl fp_ill, fp_end diff -Nru a/arch/m68k/q40/README b/arch/m68k/q40/README --- a/arch/m68k/q40/README Thu Feb 27 01:44:17 2003 +++ b/arch/m68k/q40/README Thu Feb 27 01:44:17 2003 @@ -16,7 +16,7 @@ particular device drivers. The floppy imposes a very high interrupt load on the CPU, approx 30K/s. -When something blocks interrupts (HD) it will loose some of them, so far +When something blocks interrupts (HD) it will lose some of them, so far this is not known to have caused any data loss. On highly loaded systems it can make the floppy very slow or practically stop. Other Q40 OS' simply poll the floppy for this reason - something that can't be done in Linux. diff -Nru a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c --- a/arch/m68k/sun3/config.c Thu Feb 27 01:44:26 2003 +++ b/arch/m68k/sun3/config.c Thu Feb 27 01:44:26 2003 @@ -119,7 +119,7 @@ { unsigned long start_page; - /* align start/end to page boundries */ + /* align start/end to page boundaries */ memory_start = ((memory_start + (PAGE_SIZE-1)) & PAGE_MASK); memory_end = memory_end & PAGE_MASK; diff -Nru a/arch/m68knommu/kernel/ints.c b/arch/m68knommu/kernel/ints.c --- a/arch/m68knommu/kernel/ints.c Thu Feb 27 01:44:20 2003 +++ b/arch/m68knommu/kernel/ints.c Thu Feb 27 01:44:20 2003 @@ -214,7 +214,7 @@ /* * Do we need these probe functions on the m68k? * - * ... may be usefull with ISA devices + * ... may be useful with ISA devices */ unsigned long probe_irq_on (void) { diff -Nru a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S --- a/arch/m68knommu/kernel/syscalltable.S Thu Feb 27 01:44:16 2003 +++ b/arch/m68knommu/kernel/syscalltable.S Thu Feb 27 01:44:16 2003 @@ -14,6 +14,7 @@ #include #include #include +#include .text ALIGN diff -Nru a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c --- a/arch/m68knommu/kernel/time.c Thu Feb 27 01:44:26 2003 +++ b/arch/m68knommu/kernel/time.c Thu Feb 27 01:44:26 2003 @@ -26,7 +26,7 @@ #define TICK_SIZE (tick_nsec / 1000) -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static inline int set_rtc_mmss(unsigned long nowtime) { diff -Nru a/arch/m68knommu/platform/5307/entry.S b/arch/m68knommu/platform/5307/entry.S --- a/arch/m68knommu/platform/5307/entry.S Thu Feb 27 01:44:31 2003 +++ b/arch/m68knommu/platform/5307/entry.S Thu Feb 27 01:44:31 2003 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff -Nru a/arch/m68knommu/platform/5307/vectors.c b/arch/m68knommu/platform/5307/vectors.c --- a/arch/m68knommu/platform/5307/vectors.c Thu Feb 27 01:44:28 2003 +++ b/arch/m68knommu/platform/5307/vectors.c Thu Feb 27 01:44:28 2003 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff -Nru a/arch/m68knommu/platform/68360/ints.c b/arch/m68knommu/platform/68360/ints.c --- a/arch/m68knommu/platform/68360/ints.c Thu Feb 27 01:44:16 2003 +++ b/arch/m68knommu/platform/68360/ints.c Thu Feb 27 01:44:16 2003 @@ -291,7 +291,7 @@ /* unsigned long pend = *(volatile unsigned long *)pquicc->intr_cipr; */ - /* Bugger all that wierdness. For the moment, I seem to know where I came from; + /* Bugger all that weirdness. For the moment, I seem to know where I came from; * vec is passed from a specific ISR, so I'll use it. */ if (int_irq_list[irq] && int_irq_list[irq]->handler) { diff -Nru a/arch/mips/au1000/common/serial.c b/arch/mips/au1000/common/serial.c --- a/arch/mips/au1000/common/serial.c Thu Feb 27 01:44:21 2003 +++ b/arch/mips/au1000/common/serial.c Thu Feb 27 01:44:21 2003 @@ -2703,7 +2703,7 @@ * port exists and is in use an error is returned. If the port * is not currently in the table it is added. * - * The port is then probed and if neccessary the IRQ is autodetected + * The port is then probed and if necessary the IRQ is autodetected * If this fails an error is returned. * * On success the port is ready to use and the line number is returned. diff -Nru a/arch/mips/baget/wbflush.c b/arch/mips/baget/wbflush.c --- a/arch/mips/baget/wbflush.c Thu Feb 27 01:44:26 2003 +++ b/arch/mips/baget/wbflush.c Thu Feb 27 01:44:26 2003 @@ -17,7 +17,7 @@ } /* - * Baget/MIPS doesnt need to write back the WB. + * Baget/MIPS doesn't need to write back the WB. */ static void wbflush_baget(void) { diff -Nru a/arch/mips/ddb5xxx/common/pci.c b/arch/mips/ddb5xxx/common/pci.c --- a/arch/mips/ddb5xxx/common/pci.c Thu Feb 27 01:44:31 2003 +++ b/arch/mips/ddb5xxx/common/pci.c Thu Feb 27 01:44:31 2003 @@ -20,7 +20,7 @@ * Strategies: * * . We rely on pci_auto.c file to assign PCI resources (MEM and IO) - * TODO: this shold be optional for some machines where they do have + * TODO: this should be optional for some machines where they do have * a real "pcibios" that does resource assignment. * * . We then use pci_scan_bus() to "discover" all the resources for diff -Nru a/arch/mips/dec/boot/decstation.c b/arch/mips/dec/boot/decstation.c --- a/arch/mips/dec/boot/decstation.c Thu Feb 27 01:44:23 2003 +++ b/arch/mips/dec/boot/decstation.c Thu Feb 27 01:44:23 2003 @@ -70,7 +70,7 @@ #ifdef RELOC /* - * Now copy kernel image to it's destination. + * Now copy kernel image to its destination. */ len = ((unsigned long) (&_end) - k_start); memcpy((void *)k_start, &_ftext, len); diff -Nru a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c --- a/arch/mips/kernel/irq.c Thu Feb 27 01:44:19 2003 +++ b/arch/mips/kernel/irq.c Thu Feb 27 01:44:19 2003 @@ -44,7 +44,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ printk("unexpected interrupt %d\n", irq); diff -Nru a/arch/mips/kernel/pci.c b/arch/mips/kernel/pci.c --- a/arch/mips/kernel/pci.c Thu Feb 27 01:44:26 2003 +++ b/arch/mips/kernel/pci.c Thu Feb 27 01:44:26 2003 @@ -19,7 +19,7 @@ * Strategies: * * . We rely on pci_auto.c file to assign PCI resources (MEM and IO) - * TODO: this shold be optional for some machines where they do have + * TODO: this should be optional for some machines where they do have * a real "pcibios" that does resource assignment. * * . We then use pci_scan_bus() to "discover" all the resources for diff -Nru a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c --- a/arch/mips/kernel/process.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips/kernel/process.c Thu Feb 27 01:44:22 2003 @@ -112,7 +112,7 @@ p->thread.reg31 = (unsigned long) ret_from_fork; /* - * New tasks loose permission to use the fpu. This accelerates context + * New tasks lose permission to use the fpu. This accelerates context * switching for most programs since they don't use the fpu. */ p->thread.cp0_status = read_32bit_cp0_register(CP0_STATUS) & diff -Nru a/arch/mips/kernel/r2300_misc.S b/arch/mips/kernel/r2300_misc.S --- a/arch/mips/kernel/r2300_misc.S Thu Feb 27 01:44:27 2003 +++ b/arch/mips/kernel/r2300_misc.S Thu Feb 27 01:44:27 2003 @@ -76,7 +76,7 @@ /* Check is PTE is present, if not then jump to LABEL. * PTR points to the page table where this PTE is located, * when the macro is done executing PTE will be restored - * with it's original value. + * with its original value. */ #define PTE_PRESENT(pte, ptr, label) \ andi pte, pte, (_PAGE_PRESENT | _PAGE_READ); \ diff -Nru a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S --- a/arch/mips/kernel/r2300_switch.S Thu Feb 27 01:44:27 2003 +++ b/arch/mips/kernel/r2300_switch.S Thu Feb 27 01:44:27 2003 @@ -80,7 +80,7 @@ beqz a0, 2f # Save floating point state nor t3, zero, t3 .set reorder - lw t1, ST_OFF(a0) # last thread looses fpu + lw t1, ST_OFF(a0) # last thread loses fpu and t1, t3 sw t1, ST_OFF(a0) FPU_SAVE_SINGLE(a0, t1) # clobbers t1 @@ -108,7 +108,7 @@ /* * Load the FPU with signalling NANS. This bit pattern we're using has - * the property that no matter wether considered as single or as double + * the property that no matter whether considered as single or as double * precission represents signaling NANS. * * We initialize fcr31 to rounding to nearest, no exceptions. diff -Nru a/arch/mips/kernel/r4k_misc.S b/arch/mips/kernel/r4k_misc.S --- a/arch/mips/kernel/r4k_misc.S Thu Feb 27 01:44:21 2003 +++ b/arch/mips/kernel/r4k_misc.S Thu Feb 27 01:44:21 2003 @@ -93,7 +93,7 @@ /* Check is PTE is present, if not then jump to LABEL. * PTR points to the page table where this PTE is located, * when the macro is done executing PTE will be restored - * with it's original value. + * with its original value. */ #define PTE_PRESENT(pte, ptr, label) \ andi pte, pte, (_PAGE_PRESENT | _PAGE_READ); \ diff -Nru a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S --- a/arch/mips/kernel/r4k_switch.S Thu Feb 27 01:44:30 2003 +++ b/arch/mips/kernel/r4k_switch.S Thu Feb 27 01:44:30 2003 @@ -85,7 +85,7 @@ beqz a0, 2f # Save floating point state nor t3, zero, t3 - lw t1, ST_OFF(a0) # last thread looses fpu + lw t1, ST_OFF(a0) # last thread loses fpu and t1, t3 sw t1, ST_OFF(a0) diff -Nru a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c --- a/arch/mips/kernel/setup.c Thu Feb 27 01:44:19 2003 +++ b/arch/mips/kernel/setup.c Thu Feb 27 01:44:19 2003 @@ -775,7 +775,7 @@ request_resource(&iomem_resource, res); /* - * We dont't know which RAM region contains kernel data, + * We don't know which RAM region contains kernel data, * so we try it repeatedly and let the resource manager * test it. */ diff -Nru a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c --- a/arch/mips/kernel/time.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips/kernel/time.c Thu Feb 27 01:44:22 2003 @@ -32,7 +32,7 @@ #define USECS_PER_JIFFY (1000000/HZ) #define USECS_PER_JIFFY_FRAC ((1000000ULL << 32) / HZ & 0xffffffff) -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; /* * forward reference diff -Nru a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c --- a/arch/mips/kernel/traps.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips/kernel/traps.c Thu Feb 27 01:44:22 2003 @@ -793,7 +793,7 @@ /* Some firmware leaves the BEV flag set, clear it. */ clear_cp0_status(ST0_BEV); - /* Copy the generic exception handler code to it's final destination. */ + /* Copy the generic exception handler code to its final destination. */ memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80); memcpy((void *)(KSEG0 + 0x100), &except_vec2_generic, 0x80); memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80); @@ -805,7 +805,7 @@ set_except_vector(i, handle_reserved); /* - * Copy the EJTAG debug exception vector handler code to it's final + * Copy the EJTAG debug exception vector handler code to its final * destination. */ memcpy((void *)(KSEG0 + 0x300), &except_vec_ejtag_debug, 0x80); diff -Nru a/arch/mips/math-emu/dp_add.c b/arch/mips/math-emu/dp_add.c --- a/arch/mips/math-emu/dp_add.c Thu Feb 27 01:44:21 2003 +++ b/arch/mips/math-emu/dp_add.c Thu Feb 27 01:44:21 2003 @@ -73,7 +73,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -92,7 +92,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips/math-emu/dp_div.c b/arch/mips/math-emu/dp_div.c --- a/arch/mips/math-emu/dp_div.c Thu Feb 27 01:44:18 2003 +++ b/arch/mips/math-emu/dp_div.c Thu Feb 27 01:44:18 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -89,7 +89,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return ieee754dp_inf(xs ^ ys); - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips/math-emu/dp_mul.c b/arch/mips/math-emu/dp_mul.c --- a/arch/mips/math-emu/dp_mul.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips/math-emu/dp_mul.c Thu Feb 27 01:44:22 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling */ + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF): diff -Nru a/arch/mips/math-emu/dp_sub.c b/arch/mips/math-emu/dp_sub.c --- a/arch/mips/math-emu/dp_sub.c Thu Feb 27 01:44:27 2003 +++ b/arch/mips/math-emu/dp_sub.c Thu Feb 27 01:44:27 2003 @@ -72,7 +72,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -91,7 +91,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips/math-emu/ieee754.c b/arch/mips/math-emu/ieee754.c --- a/arch/mips/math-emu/ieee754.c Thu Feb 27 01:44:17 2003 +++ b/arch/mips/math-emu/ieee754.c Thu Feb 27 01:44:17 2003 @@ -3,7 +3,7 @@ * * BUGS * not much dp done - * doesnt generate IEEE754_INEXACT + * doesn't generate IEEE754_INEXACT * */ /* diff -Nru a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c --- a/arch/mips/math-emu/ieee754dp.c Thu Feb 27 01:44:26 2003 +++ b/arch/mips/math-emu/ieee754dp.c Thu Feb 27 01:44:26 2003 @@ -99,14 +99,14 @@ } -/* generate a normal/denormal number with over,under handeling +/* generate a normal/denormal number with over,under handling * sn is sign * xe is an unbiased exponent * xm is 3bit extended precision value. */ ieee754dp ieee754dp_format(int sn, int xe, unsigned long long xm) { - assert(xm); /* we dont gen exact zeros (probably should) */ + assert(xm); /* we don't gen exact zeros (probably should) */ assert((xm >> (DP_MBITS + 1 + 3)) == 0); /* no execess */ assert(xm & (DP_HIDDEN_BIT << 3)); diff -Nru a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c --- a/arch/mips/math-emu/ieee754sp.c Thu Feb 27 01:44:21 2003 +++ b/arch/mips/math-emu/ieee754sp.c Thu Feb 27 01:44:21 2003 @@ -100,14 +100,14 @@ } -/* generate a normal/denormal number with over,under handeling +/* generate a normal/denormal number with over,under handling * sn is sign * xe is an unbiased exponent * xm is 3bit extended precision value. */ ieee754sp ieee754sp_format(int sn, int xe, unsigned xm) { - assert(xm); /* we dont gen exact zeros (probably should) */ + assert(xm); /* we don't gen exact zeros (probably should) */ assert((xm >> (SP_MBITS + 1 + 3)) == 0); /* no execess */ assert(xm & (SP_HIDDEN_BIT << 3)); diff -Nru a/arch/mips/math-emu/sp_add.c b/arch/mips/math-emu/sp_add.c --- a/arch/mips/math-emu/sp_add.c Thu Feb 27 01:44:27 2003 +++ b/arch/mips/math-emu/sp_add.c Thu Feb 27 01:44:27 2003 @@ -72,7 +72,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -91,7 +91,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips/math-emu/sp_div.c b/arch/mips/math-emu/sp_div.c --- a/arch/mips/math-emu/sp_div.c Thu Feb 27 01:44:27 2003 +++ b/arch/mips/math-emu/sp_div.c Thu Feb 27 01:44:27 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -89,7 +89,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return ieee754sp_inf(xs ^ ys); - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips/math-emu/sp_fdp.c b/arch/mips/math-emu/sp_fdp.c --- a/arch/mips/math-emu/sp_fdp.c Thu Feb 27 01:44:23 2003 +++ b/arch/mips/math-emu/sp_fdp.c Thu Feb 27 01:44:23 2003 @@ -49,7 +49,7 @@ case IEEE754_CLASS_ZERO: return ieee754sp_zero(xs); case IEEE754_CLASS_DNORM: - /* cant possibly be sp representable */ + /* can't possibly be sp representable */ SETCX(IEEE754_UNDERFLOW); return ieee754sp_xcpt(ieee754sp_zero(xs), "fdp", x); case IEEE754_CLASS_NORM: diff -Nru a/arch/mips/math-emu/sp_mul.c b/arch/mips/math-emu/sp_mul.c --- a/arch/mips/math-emu/sp_mul.c Thu Feb 27 01:44:25 2003 +++ b/arch/mips/math-emu/sp_mul.c Thu Feb 27 01:44:25 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling */ + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF): diff -Nru a/arch/mips/math-emu/sp_sub.c b/arch/mips/math-emu/sp_sub.c --- a/arch/mips/math-emu/sp_sub.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips/math-emu/sp_sub.c Thu Feb 27 01:44:22 2003 @@ -72,7 +72,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -91,7 +91,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c --- a/arch/mips/mips-boards/generic/pci.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips/mips-boards/generic/pci.c Thu Feb 27 01:44:22 2003 @@ -81,7 +81,7 @@ if (intr & (GT_INTRCAUSE_MASABORT0_BIT | GT_INTRCAUSE_TARABORT0_BIT)) { - /* Error occured */ + /* Error occurred */ /* Clear bits */ GT_WRITE( GT_INTRCAUSE_OFS, ~(GT_INTRCAUSE_MASABORT0_BIT | diff -Nru a/arch/mips64/kernel/process.c b/arch/mips64/kernel/process.c --- a/arch/mips64/kernel/process.c Thu Feb 27 01:44:21 2003 +++ b/arch/mips64/kernel/process.c Thu Feb 27 01:44:21 2003 @@ -105,7 +105,7 @@ p->thread.reg31 = (unsigned long) ret_from_fork; /* - * New tasks loose permission to use the fpu. This accelerates context + * New tasks lose permission to use the fpu. This accelerates context * switching for most programs since they don't use the fpu. */ p->thread.cp0_status = read_32bit_cp0_register(CP0_STATUS) & diff -Nru a/arch/mips64/kernel/r4k_switch.S b/arch/mips64/kernel/r4k_switch.S --- a/arch/mips64/kernel/r4k_switch.S Thu Feb 27 01:44:17 2003 +++ b/arch/mips64/kernel/r4k_switch.S Thu Feb 27 01:44:17 2003 @@ -79,7 +79,7 @@ beqz a0, 2f # Save floating point state nor t3, zero, t3 - ld t1, ST_OFF(a0) # last thread looses fpu + ld t1, ST_OFF(a0) # last thread loses fpu and t1, t3 sd t1, ST_OFF(a0) sll t2, t1, 5 diff -Nru a/arch/mips64/kernel/traps.c b/arch/mips64/kernel/traps.c --- a/arch/mips64/kernel/traps.c Thu Feb 27 01:44:25 2003 +++ b/arch/mips64/kernel/traps.c Thu Feb 27 01:44:25 2003 @@ -497,7 +497,7 @@ /* Some firmware leaves the BEV flag set, clear it. */ set_cp0_status(ST0_BEV, 0); - /* Copy the generic exception handler code to it's final destination. */ + /* Copy the generic exception handler code to its final destination. */ memcpy((void *)(KSEG0 + 0x100), &except_vec2_generic, 0x80); memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80); diff -Nru a/arch/mips64/math-emu/dp_add.c b/arch/mips64/math-emu/dp_add.c --- a/arch/mips64/math-emu/dp_add.c Thu Feb 27 01:44:31 2003 +++ b/arch/mips64/math-emu/dp_add.c Thu Feb 27 01:44:31 2003 @@ -73,7 +73,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -92,7 +92,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips64/math-emu/dp_div.c b/arch/mips64/math-emu/dp_div.c --- a/arch/mips64/math-emu/dp_div.c Thu Feb 27 01:44:16 2003 +++ b/arch/mips64/math-emu/dp_div.c Thu Feb 27 01:44:16 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -89,7 +89,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return ieee754dp_inf(xs ^ ys); - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips64/math-emu/dp_mul.c b/arch/mips64/math-emu/dp_mul.c --- a/arch/mips64/math-emu/dp_mul.c Thu Feb 27 01:44:31 2003 +++ b/arch/mips64/math-emu/dp_mul.c Thu Feb 27 01:44:31 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling */ + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF): diff -Nru a/arch/mips64/math-emu/dp_sub.c b/arch/mips64/math-emu/dp_sub.c --- a/arch/mips64/math-emu/dp_sub.c Thu Feb 27 01:44:23 2003 +++ b/arch/mips64/math-emu/dp_sub.c Thu Feb 27 01:44:23 2003 @@ -72,7 +72,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -91,7 +91,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips64/math-emu/ieee754dp.c b/arch/mips64/math-emu/ieee754dp.c --- a/arch/mips64/math-emu/ieee754dp.c Thu Feb 27 01:44:27 2003 +++ b/arch/mips64/math-emu/ieee754dp.c Thu Feb 27 01:44:27 2003 @@ -99,14 +99,14 @@ } -/* generate a normal/denormal number with over,under handeling +/* generate a normal/denormal number with over,under handling * sn is sign * xe is an unbiased exponent * xm is 3bit extended precision value. */ ieee754dp ieee754dp_format(int sn, int xe, unsigned long long xm) { - assert(xm); /* we dont gen exact zeros (probably should) */ + assert(xm); /* we don't gen exact zeros (probably should) */ assert((xm >> (DP_MBITS + 1 + 3)) == 0); /* no execess */ assert(xm & (DP_HIDDEN_BIT << 3)); diff -Nru a/arch/mips64/math-emu/ieee754sp.c b/arch/mips64/math-emu/ieee754sp.c --- a/arch/mips64/math-emu/ieee754sp.c Thu Feb 27 01:44:25 2003 +++ b/arch/mips64/math-emu/ieee754sp.c Thu Feb 27 01:44:25 2003 @@ -100,14 +100,14 @@ } -/* generate a normal/denormal number with over,under handeling +/* generate a normal/denormal number with over,under handling * sn is sign * xe is an unbiased exponent * xm is 3bit extended precision value. */ ieee754sp ieee754sp_format(int sn, int xe, unsigned xm) { - assert(xm); /* we dont gen exact zeros (probably should) */ + assert(xm); /* we don't gen exact zeros (probably should) */ assert((xm >> (SP_MBITS + 1 + 3)) == 0); /* no execess */ assert(xm & (SP_HIDDEN_BIT << 3)); diff -Nru a/arch/mips64/math-emu/sp_add.c b/arch/mips64/math-emu/sp_add.c --- a/arch/mips64/math-emu/sp_add.c Thu Feb 27 01:44:21 2003 +++ b/arch/mips64/math-emu/sp_add.c Thu Feb 27 01:44:21 2003 @@ -72,7 +72,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -91,7 +91,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips64/math-emu/sp_div.c b/arch/mips64/math-emu/sp_div.c --- a/arch/mips64/math-emu/sp_div.c Thu Feb 27 01:44:31 2003 +++ b/arch/mips64/math-emu/sp_div.c Thu Feb 27 01:44:31 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -89,7 +89,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return ieee754sp_inf(xs ^ ys); - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips64/math-emu/sp_fdp.c b/arch/mips64/math-emu/sp_fdp.c --- a/arch/mips64/math-emu/sp_fdp.c Thu Feb 27 01:44:30 2003 +++ b/arch/mips64/math-emu/sp_fdp.c Thu Feb 27 01:44:30 2003 @@ -49,7 +49,7 @@ case IEEE754_CLASS_ZERO: return ieee754sp_zero(xs); case IEEE754_CLASS_DNORM: - /* cant possibly be sp representable */ + /* can't possibly be sp representable */ SETCX(IEEE754_UNDERFLOW); return ieee754sp_xcpt(ieee754sp_zero(xs), "fdp", x); case IEEE754_CLASS_NORM: diff -Nru a/arch/mips64/math-emu/sp_mul.c b/arch/mips64/math-emu/sp_mul.c --- a/arch/mips64/math-emu/sp_mul.c Thu Feb 27 01:44:21 2003 +++ b/arch/mips64/math-emu/sp_mul.c Thu Feb 27 01:44:21 2003 @@ -72,7 +72,7 @@ return x; - /* Infinity handeling */ + /* Infinity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF): diff -Nru a/arch/mips64/math-emu/sp_sub.c b/arch/mips64/math-emu/sp_sub.c --- a/arch/mips64/math-emu/sp_sub.c Thu Feb 27 01:44:22 2003 +++ b/arch/mips64/math-emu/sp_sub.c Thu Feb 27 01:44:22 2003 @@ -72,7 +72,7 @@ return x; - /* Inifity handeling + /* Inifity handling */ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): @@ -91,7 +91,7 @@ case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): return x; - /* Zero handeling + /* Zero handling */ case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): diff -Nru a/arch/mips64/mips-boards/generic/pci.c b/arch/mips64/mips-boards/generic/pci.c --- a/arch/mips64/mips-boards/generic/pci.c Thu Feb 27 01:44:18 2003 +++ b/arch/mips64/mips-boards/generic/pci.c Thu Feb 27 01:44:18 2003 @@ -87,7 +87,7 @@ if (intr & (GT_INTRCAUSE_MASABORT0_BIT | GT_INTRCAUSE_TARABORT0_BIT)) { - /* Error occured */ + /* Error occurred */ /* Clear bits */ GT_WRITE( GT_INTRCAUSE_OFS, ~(GT_INTRCAUSE_MASABORT0_BIT | diff -Nru a/arch/mips64/sgi-ip27/ip27-nmi.c b/arch/mips64/sgi-ip27/ip27-nmi.c --- a/arch/mips64/sgi-ip27/ip27-nmi.c Thu Feb 27 01:44:17 2003 +++ b/arch/mips64/sgi-ip27/ip27-nmi.c Thu Feb 27 01:44:17 2003 @@ -127,7 +127,7 @@ * This is for 2 reasons: * - sometimes a MMSC fail to NMI all cpus. * - on 512p SN0 system, the MMSC will only send NMIs to - * half the cpus. Unfortunately, we dont know which cpus may be + * half the cpus. Unfortunately, we don't know which cpus may be * NMIed - it depends on how the site chooses to configure. * * Note: it has been measure that it takes the MMSC up to 2.3 secs to diff -Nru a/arch/mips64/sgi-ip27/ip27-pci-dma.c b/arch/mips64/sgi-ip27/ip27-pci-dma.c --- a/arch/mips64/sgi-ip27/ip27-pci-dma.c Thu Feb 27 01:44:27 2003 +++ b/arch/mips64/sgi-ip27/ip27-pci-dma.c Thu Feb 27 01:44:27 2003 @@ -74,7 +74,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff -Nru a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c --- a/arch/parisc/kernel/irq.c Thu Feb 27 01:44:22 2003 +++ b/arch/parisc/kernel/irq.c Thu Feb 27 01:44:22 2003 @@ -349,7 +349,7 @@ /* -** The alloc process needs to accept a parameter to accomodate limitations +** The alloc process needs to accept a parameter to accommodate limitations ** of the HW/SW which use these bits: ** Legacy PA I/O (GSC/NIO): 5 bits (architected EIM register) ** V-class (EPIC): 6 bits diff -Nru a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c --- a/arch/parisc/kernel/perf.c Thu Feb 27 01:44:22 2003 +++ b/arch/parisc/kernel/perf.c Thu Feb 27 01:44:22 2003 @@ -255,7 +255,7 @@ } /* - * Open the device and initialize all of it's memory. The device is only + * Open the device and initialize all of its memory. The device is only * opened once, but can be "queried" by multiple processes that know its * file descriptor. */ diff -Nru a/arch/parisc/kernel/perf_images.h b/arch/parisc/kernel/perf_images.h --- a/arch/parisc/kernel/perf_images.h Thu Feb 27 01:44:18 2003 +++ b/arch/parisc/kernel/perf_images.h Thu Feb 27 01:44:18 2003 @@ -1556,7 +1556,7 @@ * IRTN_AV fires twice for every I-cache miss returning from RIB to the IFU. * It will not fire if a second I-cache miss is issued from the IFU to RIB * before the first returns. Therefore, if the IRTN_AV count is much less - * than 2x the ICORE_AV count, many speculative I-cache misses are occuring + * than 2x the ICORE_AV count, many speculative I-cache misses are occurring * which are "discovered" to be incorrect fairly quickly. * The ratio of I-cache miss transactions on Runway to the ICORE_AV count is * a measure of the effectiveness of instruction prefetching. This ratio diff -Nru a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c --- a/arch/parisc/kernel/ptrace.c Thu Feb 27 01:44:18 2003 +++ b/arch/parisc/kernel/ptrace.c Thu Feb 27 01:44:18 2003 @@ -242,7 +242,7 @@ * * Allow writing to Nullify, Divide-step-correction, * and carry/borrow bits. - * BEWARE, if you set N, and then single step, it wont + * BEWARE, if you set N, and then single step, it won't * stop on the nullified instruction. */ DBG(("sys_ptrace(POKEUSR, %d, %lx, %lx)\n", diff -Nru a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c --- a/arch/parisc/kernel/time.c Thu Feb 27 01:44:22 2003 +++ b/arch/parisc/kernel/time.c Thu Feb 27 01:44:22 2003 @@ -32,7 +32,7 @@ #include -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; /* xtime and wall_jiffies keep wall-clock time */ extern unsigned long wall_jiffies; diff -Nru a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c --- a/arch/ppc/4xx_io/serial_sicc.c Thu Feb 27 01:44:17 2003 +++ b/arch/ppc/4xx_io/serial_sicc.c Thu Feb 27 01:44:17 2003 @@ -139,7 +139,7 @@ #define _LSR_RX_ERR (_LSR_LB_BREAK | _LSR_FE_MASK | _LSR_OE_MASK | \ _LSR_PE_MASK ) -/* serial port reciever command register */ +/* serial port receiver command register */ #define _RCR_ER_MASK 0x80 /* enable receiver mask */ #define _RCR_DME_MASK 0x60 /* dma mode */ diff -Nru a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c --- a/arch/ppc/8xx_io/cs4218_tdm.c Thu Feb 27 01:44:18 2003 +++ b/arch/ppc/8xx_io/cs4218_tdm.c Thu Feb 27 01:44:18 2003 @@ -2495,7 +2495,7 @@ cp->cp_simode &= ~0x00000fff; /* Enable common receive/transmit clock pins, use IDL format. - * Sync on falling edge, transmit rising clock, recieve falling + * Sync on falling edge, transmit rising clock, receive falling * clock, delay 1 bit on both Tx and Rx. Common Tx/Rx clocks and * sync. * Connect SMC2 to TSA. diff -Nru a/arch/ppc/kernel/l2cr.S b/arch/ppc/kernel/l2cr.S --- a/arch/ppc/kernel/l2cr.S Thu Feb 27 01:44:24 2003 +++ b/arch/ppc/kernel/l2cr.S Thu Feb 27 01:44:24 2003 @@ -136,7 +136,7 @@ /**** Might be a good idea to set L2DO here - to prevent instructions from getting into the cache. But since we invalidate the next time we enable the cache it doesn't really matter. - Don't do this unless you accomodate all processor variations. + Don't do this unless you accommodate all processor variations. The bit moved on the 7450..... ****/ diff -Nru a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c --- a/arch/ppc/kernel/time.c Thu Feb 27 01:44:27 2003 +++ b/arch/ppc/kernel/time.c Thu Feb 27 01:44:27 2003 @@ -68,7 +68,7 @@ #include /* XXX false sharing with below? */ -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; unsigned long disarm_decr[NR_CPUS]; diff -Nru a/arch/ppc/mm/mem_pieces.c b/arch/ppc/mm/mem_pieces.c --- a/arch/ppc/mm/mem_pieces.c Thu Feb 27 01:44:17 2003 +++ b/arch/ppc/mm/mem_pieces.c Thu Feb 27 01:44:17 2003 @@ -1,6 +1,6 @@ /* * Copyright (c) 1996 Paul Mackerras - * Changes to accomodate Power Macintoshes. + * Changes to accommodate Power Macintoshes. * Cort Dougan * Rewrites. * Grant Erickson diff -Nru a/arch/ppc/mm/mem_pieces.h b/arch/ppc/mm/mem_pieces.h --- a/arch/ppc/mm/mem_pieces.h Thu Feb 27 01:44:16 2003 +++ b/arch/ppc/mm/mem_pieces.h Thu Feb 27 01:44:16 2003 @@ -1,6 +1,6 @@ /* * Copyright (c) 1996 Paul Mackerras - * Changes to accomodate Power Macintoshes. + * Changes to accommodate Power Macintoshes. * Cort Dougan * Rewrites. * Grant Erickson diff -Nru a/arch/ppc/platforms/4xx/ibmstbx25.h b/arch/ppc/platforms/4xx/ibmstbx25.h --- a/arch/ppc/platforms/4xx/ibmstbx25.h Thu Feb 27 01:44:21 2003 +++ b/arch/ppc/platforms/4xx/ibmstbx25.h Thu Feb 27 01:44:21 2003 @@ -164,7 +164,7 @@ #define IBM_CPM_CPU 0x10000000 /* PPC405B3 clock control */ #define IBM_CPM_AUD 0x08000000 /* Audio Decoder */ #define IBM_CPM_EBIU 0x04000000 /* External Bus Interface Unit */ -#define IBM_CPM_IRR 0x02000000 /* Infrared reciever */ +#define IBM_CPM_IRR 0x02000000 /* Infrared receiver */ #define IBM_CPM_DMA 0x01000000 /* DMA controller */ #define IBM_CPM_UART2 0x00200000 /* Serial Control Port */ #define IBM_CPM_UART1 0x00100000 /* Serial 1 / Infrared */ diff -Nru a/arch/ppc/platforms/pmac_feature.c b/arch/ppc/platforms/pmac_feature.c --- a/arch/ppc/platforms/pmac_feature.c Thu Feb 27 01:44:30 2003 +++ b/arch/ppc/platforms/pmac_feature.c Thu Feb 27 01:44:30 2003 @@ -50,7 +50,7 @@ /* * We use a single global lock to protect accesses. Each driver has - * to take care of it's own locking + * to take care of its own locking */ static spinlock_t feature_lock __pmacdata = SPIN_LOCK_UNLOCKED; diff -Nru a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c --- a/arch/ppc/syslib/mpc10x_common.c Thu Feb 27 01:44:19 2003 +++ b/arch/ppc/syslib/mpc10x_common.c Thu Feb 27 01:44:19 2003 @@ -109,7 +109,7 @@ return -1; } - /* Make sure its a supported bridge */ + /* Make sure it's a supported bridge */ early_read_config_dword(hose, 0, PCI_DEVFN(0,0), diff -Nru a/arch/ppc64/boot/addRamDisk.c b/arch/ppc64/boot/addRamDisk.c --- a/arch/ppc64/boot/addRamDisk.c Thu Feb 27 01:44:24 2003 +++ b/arch/ppc64/boot/addRamDisk.c Thu Feb 27 01:44:24 2003 @@ -154,7 +154,7 @@ /* Process the Sysmap file to determine where _end is */ sysmapPages = sysmapLen / 4096; - /* read the whole file line by line, expect that it doesnt fail */ + /* read the whole file line by line, expect that it doesn't fail */ while ( fgets(inbuf, 4096, sysmap) ) ; /* search for _end in the last page of the system map */ ptr_end = strstr(inbuf, " _end"); diff -Nru a/arch/ppc64/boot/addSystemMap.c b/arch/ppc64/boot/addSystemMap.c --- a/arch/ppc64/boot/addSystemMap.c Thu Feb 27 01:44:22 2003 +++ b/arch/ppc64/boot/addSystemMap.c Thu Feb 27 01:44:22 2003 @@ -146,7 +146,7 @@ /* Process the Sysmap file to determine the true end of the kernel */ sysmapPages = sysmapLen / 4096; printf("System map pages to copy = %ld\n", sysmapPages); - /* read the whole file line by line, expect that it doesnt fail */ + /* read the whole file line by line, expect that it doesn't fail */ while ( fgets(inbuf, 4096, sysmap) ) ; /* search for _end in the last page of the system map */ ptr_end = strstr(inbuf, " _end"); diff -Nru a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S --- a/arch/ppc64/kernel/head.S Thu Feb 27 01:44:23 2003 +++ b/arch/ppc64/kernel/head.S Thu Feb 27 01:44:23 2003 @@ -109,7 +109,7 @@ .llong 0x0 /* Secondary processors write this value with their cpu # */ - /* after they enter the spin loop immediatly below. */ + /* after they enter the spin loop immediately below. */ .globl __secondary_hold_acknowledge __secondary_hold_acknowledge: .llong 0x0 diff -Nru a/arch/ppc64/kernel/ioctl32.c b/arch/ppc64/kernel/ioctl32.c --- a/arch/ppc64/kernel/ioctl32.c Thu Feb 27 01:44:31 2003 +++ b/arch/ppc64/kernel/ioctl32.c Thu Feb 27 01:44:31 2003 @@ -3315,7 +3315,7 @@ * * But how to keep track of these kernel buffers? We'd need to either * keep track of them in some table _or_ know about usbdevicefs internals - * (ie. the exact layout of it's file private, which is actually defined + * (ie. the exact layout of its file private, which is actually defined * in linux/usbdevice_fs.h, the layout of the async queues are private to * devio.c) * diff -Nru a/arch/ppc64/kernel/lmb.c b/arch/ppc64/kernel/lmb.c --- a/arch/ppc64/kernel/lmb.c Thu Feb 27 01:44:24 2003 +++ b/arch/ppc64/kernel/lmb.c Thu Feb 27 01:44:24 2003 @@ -73,7 +73,7 @@ _lmb->reserved.cnt = 1; } -/* This is only used here, it doesnt deserve to be in bitops.h */ +/* This is only used here, it doesn't deserve to be in bitops.h */ static __inline__ long cnt_trailing_zeros(unsigned long mask) { long cnt; diff -Nru a/arch/ppc64/kernel/pSeries_lpar.c b/arch/ppc64/kernel/pSeries_lpar.c --- a/arch/ppc64/kernel/pSeries_lpar.c Thu Feb 27 01:44:31 2003 +++ b/arch/ppc64/kernel/pSeries_lpar.c Thu Feb 27 01:44:31 2003 @@ -461,7 +461,7 @@ return -1; /* - * Since we try and ioremap PHBs we dont own, the pte insert + * Since we try and ioremap PHBs we don't own, the pte insert * will fail. However we must catch the failure in hash_page * or we will loop forever, so return -2 in this case. */ @@ -485,7 +485,7 @@ for (i = 0; i < HPTES_PER_GROUP; i++) { - /* dont remove a bolted entry */ + /* don't remove a bolted entry */ lpar_rc = plpar_pte_remove(H_ANDCOND, hpte_group + slot_offset, (0x1UL << 4), &dummy1, &dummy2); diff -Nru a/arch/ppc64/kernel/pci_dn.c b/arch/ppc64/kernel/pci_dn.c --- a/arch/ppc64/kernel/pci_dn.c Thu Feb 27 01:44:31 2003 +++ b/arch/ppc64/kernel/pci_dn.c Thu Feb 27 01:44:31 2003 @@ -150,7 +150,7 @@ } /* This is the "slow" path for looking up a device_node from a - * pci_dev. It will hunt for the device under it's parent's + * pci_dev. It will hunt for the device under its parent's * phb and then update sysdata for a future fastpath. * * It may also do fixups on the actual device since this happens diff -Nru a/arch/ppc64/kernel/ras.c b/arch/ppc64/kernel/ras.c --- a/arch/ppc64/kernel/ras.c Thu Feb 27 01:44:21 2003 +++ b/arch/ppc64/kernel/ras.c Thu Feb 27 01:44:21 2003 @@ -94,7 +94,7 @@ /* * Handle power subsystem events (EPOW). * - * Presently we just log the event has occured. This should be fixed + * Presently we just log the event has occurred. This should be fixed * to examine the type of power failure and take appropriate action where * the time horizon permits something useful to be done. */ diff -Nru a/arch/ppc64/kernel/smp.c b/arch/ppc64/kernel/smp.c --- a/arch/ppc64/kernel/smp.c Thu Feb 27 01:44:27 2003 +++ b/arch/ppc64/kernel/smp.c Thu Feb 27 01:44:27 2003 @@ -51,7 +51,7 @@ int smp_threads_ready = 0; unsigned long cache_decay_ticks; -/* initialised so it doesnt end up in bss */ +/* initialised so it doesn't end up in bss */ unsigned long cpu_online_map = 0; static struct smp_ops_t *smp_ops; diff -Nru a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c --- a/arch/ppc64/kernel/time.c Thu Feb 27 01:44:30 2003 +++ b/arch/ppc64/kernel/time.c Thu Feb 27 01:44:30 2003 @@ -65,7 +65,7 @@ void smp_local_timer_interrupt(struct pt_regs *); -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; /* keep track of when we need to update the rtc */ time_t last_rtc_update; diff -Nru a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c --- a/arch/ppc64/xmon/xmon.c Thu Feb 27 01:44:28 2003 +++ b/arch/ppc64/xmon/xmon.c Thu Feb 27 01:44:28 2003 @@ -2072,7 +2072,7 @@ int instr; int num_parms; - /* dont look for traceback table in userspace */ + /* don't look for traceback table in userspace */ if (codeaddr < PAGE_OFFSET) return 0; diff -Nru a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c --- a/arch/s390/kernel/time.c Thu Feb 27 01:44:17 2003 +++ b/arch/s390/kernel/time.c Thu Feb 27 01:44:17 2003 @@ -46,7 +46,7 @@ #define TICK_SIZE tick -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static ext_int_info_t ext_int_info_timer; static uint64_t xtime_cc; diff -Nru a/arch/s390x/kernel/time.c b/arch/s390x/kernel/time.c --- a/arch/s390x/kernel/time.c Thu Feb 27 01:44:27 2003 +++ b/arch/s390x/kernel/time.c Thu Feb 27 01:44:27 2003 @@ -45,7 +45,7 @@ #define TICK_SIZE tick -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static ext_int_info_t ext_int_info_timer; static uint64_t xtime_cc; diff -Nru a/arch/sh/kernel/fpu.c b/arch/sh/kernel/fpu.c --- a/arch/sh/kernel/fpu.c Thu Feb 27 01:44:24 2003 +++ b/arch/sh/kernel/fpu.c Thu Feb 27 01:44:24 2003 @@ -118,7 +118,7 @@ /* * Load the FPU with signalling NANS. This bit pattern we're using - * has the property that no matter wether considered as single or as + * has the property that no matter whether considered as single or as * double precission represents signaling NANS. */ diff -Nru a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c --- a/arch/sh/kernel/irq.c Thu Feb 27 01:44:22 2003 +++ b/arch/sh/kernel/irq.c Thu Feb 27 01:44:22 2003 @@ -61,7 +61,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ printk("unexpected IRQ trap at vector %02x\n", irq); diff -Nru a/arch/sh/kernel/pci-dma.c b/arch/sh/kernel/pci-dma.c --- a/arch/sh/kernel/pci-dma.c Thu Feb 27 01:44:27 2003 +++ b/arch/sh/kernel/pci-dma.c Thu Feb 27 01:44:27 2003 @@ -24,7 +24,7 @@ ret = (void *) __get_free_pages(gfp, get_order(size)); if (ret != NULL) { - /* Is it neccessary to do the memset? */ + /* Is it necessary to do the memset? */ memset(ret, 0, size); *dma_handle = virt_to_bus(ret); } diff -Nru a/arch/sh/kernel/pci-sh7751.c b/arch/sh/kernel/pci-sh7751.c --- a/arch/sh/kernel/pci-sh7751.c Thu Feb 27 01:44:26 2003 +++ b/arch/sh/kernel/pci-sh7751.c Thu Feb 27 01:44:26 2003 @@ -285,7 +285,7 @@ struct pci_ops *bios = NULL; struct pci_ops *dir = NULL; - PCIDBG(1,"PCI: Starting intialization.\n"); + PCIDBG(1,"PCI: Starting initialization.\n"); #ifdef CONFIG_PCI_BIOS if ((pci_probe & PCI_PROBE_BIOS) && ((bios = pci_find_bios()))) { pci_probe |= PCI_BIOS_SORT; diff -Nru a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c --- a/arch/sh/kernel/time.c Thu Feb 27 01:44:16 2003 +++ b/arch/sh/kernel/time.c Thu Feb 27 01:44:16 2003 @@ -70,7 +70,7 @@ #endif /* CONFIG_CPU_SUBTYPE_ST40STB1 */ #endif /* __sh3__ or __SH4__ */ -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; extern unsigned long wall_jiffies; #define TICK_SIZE tick diff -Nru a/arch/sh/stboards/pcidma.c b/arch/sh/stboards/pcidma.c --- a/arch/sh/stboards/pcidma.c Thu Feb 27 01:44:22 2003 +++ b/arch/sh/stboards/pcidma.c Thu Feb 27 01:44:22 2003 @@ -24,7 +24,7 @@ ret = (void *) __get_free_pages(gfp, get_order(size)); if (ret != NULL) { - /* Is it neccessary to do the memset? */ + /* Is it necessary to do the memset? */ memset(ret, 0, size); *dma_handle = virt_to_bus(ret); } diff -Nru a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c --- a/arch/sparc/kernel/init_task.c Thu Feb 27 01:44:24 2003 +++ b/arch/sparc/kernel/init_task.c Thu Feb 27 01:44:24 2003 @@ -12,7 +12,7 @@ struct mm_struct init_mm = INIT_MM(init_mm); struct task_struct init_task = INIT_TASK(init_task); -/* .text section in head.S is aligned at 8k boundry and this gets linked +/* .text section in head.S is aligned at 8k boundary and this gets linked * right after that so that the init_thread_union is aligned properly as well. * If this is not aligned on a 8k boundry, then you should change code * in etrap.S which assumes it. diff -Nru a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c --- a/arch/sparc/kernel/ioport.c Thu Feb 27 01:44:31 2003 +++ b/arch/sparc/kernel/ioport.c Thu Feb 27 01:44:31 2003 @@ -599,7 +599,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t ba, size_t size, diff -Nru a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c --- a/arch/sparc/kernel/time.c Thu Feb 27 01:44:24 2003 +++ b/arch/sparc/kernel/time.c Thu Feb 27 01:44:24 2003 @@ -45,7 +45,7 @@ extern unsigned long wall_jiffies; -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; enum sparc_clock_type sp_clock_typ; diff -Nru a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S --- a/arch/sparc/lib/blockops.S Thu Feb 27 01:44:31 2003 +++ b/arch/sparc/lib/blockops.S Thu Feb 27 01:44:31 2003 @@ -38,7 +38,7 @@ * and (2 * PAGE_SIZE) (for kernel stacks) * and with a second arg of zero. We assume in * all of these cases that the buffer is aligned - * on at least an 8 byte boundry. + * on at least an 8 byte boundary. * * Therefore we special case them to make them * as fast as possible. diff -Nru a/arch/sparc/lib/checksum.S b/arch/sparc/lib/checksum.S --- a/arch/sparc/lib/checksum.S Thu Feb 27 01:44:24 2003 +++ b/arch/sparc/lib/checksum.S Thu Feb 27 01:44:24 2003 @@ -336,7 +336,7 @@ bne cc_dword_align ! yes, we check for short lengths there andcc %g1, 0xffffff80, %g0 ! can we use unrolled loop? 3: be 3f ! nope, less than one loop remains - andcc %o1, 4, %g0 ! dest aligned on 4 or 8 byte boundry? + andcc %o1, 4, %g0 ! dest aligned on 4 or 8 byte boundary? be ccdbl + 4 ! 8 byte aligned, kick ass 5: CSUMCOPY_BIGCHUNK(%o0,%o1,%g7,0x00,%o4,%o5,%g2,%g3,%g4,%g5,%o2,%o3) CSUMCOPY_BIGCHUNK(%o0,%o1,%g7,0x20,%o4,%o5,%g2,%g3,%g4,%g5,%o2,%o3) diff -Nru a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c --- a/arch/sparc/mm/srmmu.c Thu Feb 27 01:44:24 2003 +++ b/arch/sparc/mm/srmmu.c Thu Feb 27 01:44:24 2003 @@ -2120,7 +2120,7 @@ srmmu_is_bad(); } -/* dont laugh, static pagetables */ +/* don't laugh, static pagetables */ static void srmmu_check_pgt_cache(int low, int high) { } diff -Nru a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c --- a/arch/sparc/mm/sun4c.c Thu Feb 27 01:44:27 2003 +++ b/arch/sparc/mm/sun4c.c Thu Feb 27 01:44:27 2003 @@ -533,7 +533,7 @@ } } -/* Addr is always aligned on a page boundry for us already. */ +/* Addr is always aligned on a page boundary for us already. */ static void sun4c_map_dma_area(unsigned long va, u32 addr, int len) { unsigned long page, end; @@ -1042,7 +1042,7 @@ get_locked_segment(addr); /* We are changing the virtual color of the page(s) - * so we must flush the cache to guarentee consistency. + * so we must flush the cache to guarantee consistency. */ sun4c_flush_page(pages); #ifndef CONFIG_SUN4 diff -Nru a/arch/sparc64/kernel/init_task.c b/arch/sparc64/kernel/init_task.c --- a/arch/sparc64/kernel/init_task.c Thu Feb 27 01:44:31 2003 +++ b/arch/sparc64/kernel/init_task.c Thu Feb 27 01:44:31 2003 @@ -12,7 +12,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); -/* .text section in head.S is aligned at 2 page boundry and this gets linked +/* .text section in head.S is aligned at 2 page boundary and this gets linked * right after that so that the init_thread_union is aligned properly as well. * We really don't need this special alignment like the Intel does, but * I do it anyways for completeness. diff -Nru a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c --- a/arch/sparc64/kernel/ioctl32.c Thu Feb 27 01:44:29 2003 +++ b/arch/sparc64/kernel/ioctl32.c Thu Feb 27 01:44:29 2003 @@ -3947,7 +3947,7 @@ * * But how to keep track of these kernel buffers? We'd need to either * keep track of them in some table _or_ know about usbdevicefs internals - * (ie. the exact layout of it's file private, which is actually defined + * (ie. the exact layout of its file private, which is actually defined * in linux/usbdevice_fs.h, the layout of the async queues are private to * devio.c) * diff -Nru a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h --- a/arch/sparc64/kernel/iommu_common.h Thu Feb 27 01:44:31 2003 +++ b/arch/sparc64/kernel/iommu_common.h Thu Feb 27 01:44:31 2003 @@ -40,7 +40,7 @@ /* Two addresses are "virtually contiguous" if and only if: * 1) They are equal, or... - * 2) They are both on a page boundry + * 2) They are both on a page boundary */ #define VCONTIG(__X, __Y) (((__X) == (__Y)) || \ (((__X) | (__Y)) << (64UL - PAGE_SHIFT)) == 0UL) diff -Nru a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c --- a/arch/sparc64/kernel/pci_common.c Thu Feb 27 01:44:20 2003 +++ b/arch/sparc64/kernel/pci_common.c Thu Feb 27 01:44:20 2003 @@ -583,7 +583,7 @@ * the PBM. * * However if that parent bridge has interrupt map/mask - * properties of it's own we use the PROM register property + * properties of its own we use the PROM register property * of the next child device on the path to PDEV. * * In detail the two cases are (note that the 'X' below is the diff -Nru a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c --- a/arch/sparc64/kernel/sbus.c Thu Feb 27 01:44:31 2003 +++ b/arch/sparc64/kernel/sbus.c Thu Feb 27 01:44:31 2003 @@ -24,7 +24,7 @@ #include "iommu_common.h" /* These should be allocated on an SMP_CACHE_BYTES - * aligned boundry for optimal performance. + * aligned boundary for optimal performance. * * On SYSIO, using an 8K page size we have 1GB of SBUS * DMA space mapped. We divide this space into equally diff -Nru a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c --- a/arch/sparc64/kernel/time.c Thu Feb 27 01:44:23 2003 +++ b/arch/sparc64/kernel/time.c Thu Feb 27 01:44:23 2003 @@ -47,7 +47,7 @@ extern unsigned long wall_jiffies; -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static unsigned long mstk48t08_regs = 0UL; static unsigned long mstk48t59_regs = 0UL; diff -Nru a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c --- a/arch/sparc64/kernel/traps.c Thu Feb 27 01:44:30 2003 +++ b/arch/sparc64/kernel/traps.c Thu Feb 27 01:44:30 2003 @@ -571,7 +571,7 @@ unsigned long flush_linesize = ecache_flush_linesize; unsigned long flush_size = ecache_flush_size; - /* Run through the whole cache to guarentee the timed loop + /* Run through the whole cache to guarantee the timed loop * is really displacing cache lines. */ __asm__ __volatile__("1: subcc %0, %4, %0\n\t" diff -Nru a/arch/sparc64/lib/U3copy_from_user.S b/arch/sparc64/lib/U3copy_from_user.S --- a/arch/sparc64/lib/U3copy_from_user.S Thu Feb 27 01:44:20 2003 +++ b/arch/sparc64/lib/U3copy_from_user.S Thu Feb 27 01:44:20 2003 @@ -416,7 +416,7 @@ 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -425,7 +425,7 @@ * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff -Nru a/arch/sparc64/lib/U3copy_in_user.S b/arch/sparc64/lib/U3copy_in_user.S --- a/arch/sparc64/lib/U3copy_in_user.S Thu Feb 27 01:44:22 2003 +++ b/arch/sparc64/lib/U3copy_in_user.S Thu Feb 27 01:44:22 2003 @@ -447,7 +447,7 @@ 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -456,7 +456,7 @@ * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff -Nru a/arch/sparc64/lib/U3copy_to_user.S b/arch/sparc64/lib/U3copy_to_user.S --- a/arch/sparc64/lib/U3copy_to_user.S Thu Feb 27 01:44:16 2003 +++ b/arch/sparc64/lib/U3copy_to_user.S Thu Feb 27 01:44:16 2003 @@ -463,7 +463,7 @@ 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -472,7 +472,7 @@ * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff -Nru a/arch/sparc64/lib/U3memcpy.S b/arch/sparc64/lib/U3memcpy.S --- a/arch/sparc64/lib/U3memcpy.S Thu Feb 27 01:44:31 2003 +++ b/arch/sparc64/lib/U3memcpy.S Thu Feb 27 01:44:31 2003 @@ -344,7 +344,7 @@ 2: VISEntryHalf ! MS+MS - /* Compute (len - (len % 8)) into %g2. This is guarenteed + /* Compute (len - (len % 8)) into %g2. This is guaranteed * to be nonzero. */ andn %o2, 0x7, %g2 ! A0 Group @@ -353,7 +353,7 @@ * one 8-byte longword past the end of src. It actually * does not, as %g2 is subtracted as loads are done from * src, so we always stop before running off the end. - * Also, we are guarenteed to have at least 0x10 bytes + * Also, we are guaranteed to have at least 0x10 bytes * to move here. */ sub %g2, 0x8, %g2 ! A0 Group (reg-dep) diff -Nru a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c --- a/arch/sparc64/mm/hugetlbpage.c Thu Feb 27 01:44:26 2003 +++ b/arch/sparc64/mm/hugetlbpage.c Thu Feb 27 01:44:26 2003 @@ -25,6 +25,7 @@ extern long htlbpagemem; static void zap_hugetlb_resources(struct vm_area_struct *); +void free_huge_page(struct page *page); #define MAX_ID 32 struct htlbpagekey { @@ -64,6 +65,7 @@ spin_unlock(&htlbpage_lock); set_page_count(page, 1); + page->lru.prev = (void *)free_huge_page; memset(page_address(page), 0, HPAGE_SIZE); return page; diff -Nru a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c --- a/arch/sparc64/prom/misc.c Thu Feb 27 01:44:27 2003 +++ b/arch/sparc64/prom/misc.c Thu Feb 27 01:44:27 2003 @@ -142,7 +142,7 @@ return prom_prev; } -/* Install Linux trap table so PROM uses that instead of it's own. */ +/* Install Linux trap table so PROM uses that instead of its own. */ void prom_set_trap_table(unsigned long tba) { p1275_cmd("SUNW,set-trap-table", P1275_INOUT(1, 0), tba); diff -Nru a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c --- a/arch/um/kernel/irq.c Thu Feb 27 01:44:27 2003 +++ b/arch/um/kernel/irq.c Thu Feb 27 01:44:27 2003 @@ -45,7 +45,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ #if CONFIG_X86 diff -Nru a/arch/v850/kernel/irq.c b/arch/v850/kernel/irq.c --- a/arch/v850/kernel/irq.c Thu Feb 27 01:44:27 2003 +++ b/arch/v850/kernel/irq.c Thu Feb 27 01:44:27 2003 @@ -48,7 +48,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ printk("received IRQ %d with unknown interrupt type\n", irq); diff -Nru a/arch/v850/kernel/ma.c b/arch/v850/kernel/ma.c --- a/arch/v850/kernel/ma.c Thu Feb 27 01:44:19 2003 +++ b/arch/v850/kernel/ma.c Thu Feb 27 01:44:19 2003 @@ -61,7 +61,7 @@ specific chips may have more). */ if (chan < 2) { unsigned bits = 0x3 << (chan * 3); - /* Specify that the relevent pins on the chip should do + /* Specify that the relevant pins on the chip should do serial I/O, not direct I/O. */ MA_PORT4_PMC |= bits; /* Specify that we're using the UART, not the CSI device. */ diff -Nru a/arch/v850/kernel/rte_cb_multi.c b/arch/v850/kernel/rte_cb_multi.c --- a/arch/v850/kernel/rte_cb_multi.c Thu Feb 27 01:44:21 2003 +++ b/arch/v850/kernel/rte_cb_multi.c Thu Feb 27 01:44:21 2003 @@ -67,7 +67,7 @@ if ((word & 0xFC0) == 0x780) { /* A `jr' insn, fix up its offset (and yes, the - wierd half-word swapping is intentional). */ + weird half-word swapping is intentional). */ unsigned short hi = word & 0xFFFF; unsigned short lo = word >> 16; unsigned long udisp22 diff -Nru a/arch/v850/kernel/rte_ma1_cb.c b/arch/v850/kernel/rte_ma1_cb.c --- a/arch/v850/kernel/rte_ma1_cb.c Thu Feb 27 01:44:27 2003 +++ b/arch/v850/kernel/rte_ma1_cb.c Thu Feb 27 01:44:27 2003 @@ -93,7 +93,7 @@ /* Turn on the timer. */ NB85E_TIMER_C_TMCC0 (tc) |= NB85E_TIMER_C_TMCC0_CAE; - /* Make sure the relevent port0/port1 pins are assigned + /* Make sure the relevant port0/port1 pins are assigned interrupt duty. We used INTP001-INTP011 (don't screw with INTP000 because the monitor uses it). */ MA_PORT0_PMC |= 0x4; /* P02 (INTP001) in IRQ mode. */ diff -Nru a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c --- a/arch/v850/kernel/time.c Thu Feb 27 01:44:25 2003 +++ b/arch/v850/kernel/time.c Thu Feb 27 01:44:25 2003 @@ -25,7 +25,7 @@ #include "mach.h" -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; #define TICK_SIZE (tick_nsec / 1000) diff -Nru a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c --- a/arch/x86_64/ia32/ia32_ioctl.c Thu Feb 27 01:44:23 2003 +++ b/arch/x86_64/ia32/ia32_ioctl.c Thu Feb 27 01:44:23 2003 @@ -3196,7 +3196,7 @@ * * But how to keep track of these kernel buffers? We'd need to either * keep track of them in some table _or_ know about usbdevicefs internals - * (ie. the exact layout of it's file private, which is actually defined + * (ie. the exact layout of its file private, which is actually defined * in linux/usbdevice_fs.h, the layout of the async queues are private to * devio.c) * diff -Nru a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c --- a/arch/x86_64/kernel/apic.c Thu Feb 27 01:44:19 2003 +++ b/arch/x86_64/kernel/apic.c Thu Feb 27 01:44:19 2003 @@ -292,7 +292,7 @@ __error_in_apic_c(); /* - * Double-check wether this APIC is really registered. + * Double-check whether this APIC is really registered. * This is meaningless in clustered apic mode, so we skip it. */ if (!clustered_apic_mode && @@ -948,7 +948,7 @@ /* * Local APIC timer interrupt. This is the most natural way for doing * local interrupts, but local timer interrupts can be emulated by - * broadcast interrupts too. [in case the hw doesnt support APIC timers] + * broadcast interrupts too. [in case the hw doesn't support APIC timers] * * [ if a single-CPU system runs an SMP kernel then we call the local * interrupt as well. Thus we cannot inline the local irq ... ] diff -Nru a/arch/x86_64/kernel/bluesmoke.c b/arch/x86_64/kernel/bluesmoke.c --- a/arch/x86_64/kernel/bluesmoke.c Thu Feb 27 01:44:28 2003 +++ b/arch/x86_64/kernel/bluesmoke.c Thu Feb 27 01:44:28 2003 @@ -120,7 +120,7 @@ rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high); if ((low | high) != 0) { - printk (KERN_EMERG "MCE: The hardware reports a non fatal, correctable incident occured on CPU %d.\n", smp_processor_id()); + printk (KERN_EMERG "MCE: The hardware reports a non fatal, correctable incident occurred on CPU %d.\n", smp_processor_id()); printk (KERN_EMERG "Bank %d: %08x%08x\n", i, high, low); /* Scrub the error so we don't pick it up in MCE_RATE seconds time. */ diff -Nru a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c --- a/arch/x86_64/kernel/e820.c Thu Feb 27 01:44:21 2003 +++ b/arch/x86_64/kernel/e820.c Thu Feb 27 01:44:21 2003 @@ -204,7 +204,7 @@ request_resource(&iomem_resource, res); if (e820.map[i].type == E820_RAM) { /* - * We dont't know which RAM region contains kernel data, + * We don't know which RAM region contains kernel data, * so we try it repeatedly and let the resource manager * test it. */ diff -Nru a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c --- a/arch/x86_64/kernel/io_apic.c Thu Feb 27 01:44:23 2003 +++ b/arch/x86_64/kernel/io_apic.c Thu Feb 27 01:44:23 2003 @@ -685,7 +685,7 @@ entry.vector = vector; /* - * The timer IRQ doesnt have to know that behind the + * The timer IRQ doesn't have to know that behind the * scene we have a 8259A-master in AEOI mode ... */ irq_desc[0].handler = &ioapic_edge_irq_type; @@ -1539,7 +1539,7 @@ printk(" failed.\n"); if (nmi_watchdog) { - printk(KERN_WARNING "timer doesnt work through the IO-APIC - disabling NMI Watchdog!\n"); + printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); nmi_watchdog = 0; } diff -Nru a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c --- a/arch/x86_64/kernel/irq.c Thu Feb 27 01:44:22 2003 +++ b/arch/x86_64/kernel/irq.c Thu Feb 27 01:44:22 2003 @@ -87,7 +87,7 @@ { /* * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves, it doesnt deserve + * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ #if CONFIG_X86 diff -Nru a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c --- a/arch/x86_64/kernel/nmi.c Thu Feb 27 01:44:22 2003 +++ b/arch/x86_64/kernel/nmi.c Thu Feb 27 01:44:22 2003 @@ -228,7 +228,7 @@ * as these watchdog NMI IRQs are generated on every CPU, we only * have to check the current processor. * - * since NMIs dont listen to _any_ locks, we have to be extremely + * since NMIs don't listen to _any_ locks, we have to be extremely * careful not to rely on unsafe variables. The printk might lock * up though, so we have to break up any console locks first ... * [when there will be more tty-related locks, break them up diff -Nru a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c --- a/arch/x86_64/kernel/pci-gart.c Thu Feb 27 01:44:22 2003 +++ b/arch/x86_64/kernel/pci-gart.c Thu Feb 27 01:44:22 2003 @@ -437,6 +437,7 @@ } flush_gart(); + global_flush_tlb(); printk("PCI-DMA: aperture base @ %x size %u KB\n", aper_base, aper_size>>10); return 0; diff -Nru a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c --- a/arch/x86_64/kernel/smpboot.c Thu Feb 27 01:44:31 2003 +++ b/arch/x86_64/kernel/smpboot.c Thu Feb 27 01:44:31 2003 @@ -104,7 +104,7 @@ /* * TSC synchronization. * - * We first check wether all CPUs have their TSC's synchronized, + * We first check whether all CPUs have their TSC's synchronized, * then we print a warning if not, and always resync. */ @@ -774,7 +774,7 @@ } /* - * If we couldnt find an SMP configuration at boot time, + * If we couldn't find an SMP configuration at boot time, * get out of here now! */ if (!smp_found_config) { diff -Nru a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c --- a/arch/x86_64/kernel/time.c Thu Feb 27 01:44:26 2003 +++ b/arch/x86_64/kernel/time.c Thu Feb 27 01:44:26 2003 @@ -30,7 +30,7 @@ #include #endif -u64 jiffies_64; +u64 jiffies_64; extern int using_apic_timer; diff -Nru a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c --- a/arch/x86_64/mm/ioremap.c Thu Feb 27 01:44:30 2003 +++ b/arch/x86_64/mm/ioremap.c Thu Feb 27 01:44:30 2003 @@ -205,6 +205,7 @@ iounmap(p); p = NULL; } + global_flush_tlb(); } return p; @@ -226,6 +227,7 @@ change_page_attr(virt_to_page(__va(p->phys_addr)), p->size >> PAGE_SHIFT, PAGE_KERNEL); + global_flush_tlb(); } kfree(p); } diff -Nru a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c --- a/drivers/acorn/block/fd1772.c Thu Feb 27 01:44:21 2003 +++ b/drivers/acorn/block/fd1772.c Thu Feb 27 01:44:21 2003 @@ -1081,7 +1081,7 @@ MotorOn = 1; START_TIMEOUT(); /* we must wait for the IRQ here, because the ST-DMA is - * released immediatly afterwards and the interrupt may be + * released immediately afterwards and the interrupt may be * delivered to the wrong driver. */ } diff -Nru a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c --- a/drivers/acorn/block/mfmhd.c Thu Feb 27 01:44:20 2003 +++ b/drivers/acorn/block/mfmhd.c Thu Feb 27 01:44:20 2003 @@ -406,7 +406,7 @@ outw(command, MFM_COMMAND); status = inw(MFM_STATUS); - DBG("issue_command: status immediatly after command issue: %02X:\n ", status >> 8); + DBG("issue_command: status immediately after command issue: %02X:\n ", status >> 8); } static void wait_for_completion(void) @@ -451,7 +451,7 @@ return; }; - /* OK so what ever happend its not an error, now I reckon we are left between + /* OK so what ever happened it's not an error, now I reckon we are left between a choice of command end or some data which is ready to be collected */ /* I think we have to transfer data while the interrupt line is on and its not any other type of interrupt */ diff -Nru a/drivers/acorn/net/ether3.c b/drivers/acorn/net/ether3.c --- a/drivers/acorn/net/ether3.c Thu Feb 27 01:44:30 2003 +++ b/drivers/acorn/net/ether3.c Thu Feb 27 01:44:30 2003 @@ -101,7 +101,7 @@ /* * ether3 read/write. Slow things down a bit... - * The SEEQ8005 doesn't like us writing to it's registers + * The SEEQ8005 doesn't like us writing to its registers * too quickly. */ static inline void ether3_outb(int v, const int r) @@ -304,7 +304,7 @@ /* * There is a problem with the NQ8005 in that it occasionally loses the * last two bytes. To get round this problem, we receive the CRC as - * well. That way, if we do loose the last two, then it doesn't matter. + * well. That way, if we do lose the last two, then it doesn't matter. */ ether3_outw(priv->regs.config1 | CFG1_TRANSEND, REG_CONFIG1); ether3_outw((TX_END>>8) - 1, REG_BUFWIN); diff -Nru a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c --- a/drivers/acpi/dispatcher/dsobject.c Thu Feb 27 01:44:17 2003 +++ b/drivers/acpi/dispatcher/dsobject.c Thu Feb 27 01:44:17 2003 @@ -396,7 +396,7 @@ return_ACPI_STATUS (status); } - /* Re-type the object according to it's argument */ + /* Re-type the object according to its argument */ node->type = ACPI_GET_OBJECT_TYPE (obj_desc); diff -Nru a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c --- a/drivers/acpi/events/evevent.c Thu Feb 27 01:44:27 2003 +++ b/drivers/acpi/events/evevent.c Thu Feb 27 01:44:27 2003 @@ -79,7 +79,7 @@ /* * Initialize the Fixed and General Purpose acpi_events prior. This is - * done prior to enabling SCIs to prevent interrupts from occuring + * done prior to enabling SCIs to prevent interrupts from occurring * before handers are installed. */ status = acpi_ev_fixed_event_initialize (); diff -Nru a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c --- a/drivers/acpi/events/evrgnini.c Thu Feb 27 01:44:18 2003 +++ b/drivers/acpi/events/evrgnini.c Thu Feb 27 01:44:18 2003 @@ -410,7 +410,7 @@ * Get the appropriate address space handler for a newly * created region. * - * This also performs address space specific intialization. For + * This also performs address space specific initialization. For * example, PCI regions must have an _ADR object that contains * a PCI address in the scope of the definition. This address is * required to perform an access to PCI config space. diff -Nru a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c --- a/drivers/acpi/hardware/hwregs.c Thu Feb 27 01:44:27 2003 +++ b/drivers/acpi/hardware/hwregs.c Thu Feb 27 01:44:27 2003 @@ -370,7 +370,7 @@ /* * Status Registers are different from the rest. Clear by - * writing 1, writing 0 has no effect. So, the only relevent + * writing 1, writing 0 has no effect. So, the only relevant * information is the single bit we're interested in, all others should * be written as 0 so they will be left unchanged */ diff -Nru a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c --- a/drivers/acpi/hardware/hwtimer.c Thu Feb 27 01:44:18 2003 +++ b/drivers/acpi/hardware/hwtimer.c Thu Feb 27 01:44:18 2003 @@ -133,7 +133,7 @@ * transitions (unlike many CPU timestamp counters) -- making it * a versatile and accurate timer. * - * Note that this function accomodates only a single timer + * Note that this function accommodates only a single timer * rollover. Thus for 24-bit timers, this function should only * be used for calculating durations less than ~4.6 seconds * (~20 minutes for 32-bit timers) -- calculations below diff -Nru a/drivers/acpi/power.c b/drivers/acpi/power.c --- a/drivers/acpi/power.c Thu Feb 27 01:44:23 2003 +++ b/drivers/acpi/power.c Thu Feb 27 01:44:23 2003 @@ -351,7 +351,7 @@ /* * First we reference all power resources required in the target list - * (e.g. so the device doesn't loose power while transitioning). + * (e.g. so the device doesn't lose power while transitioning). */ for (i=0; icount; i++) { result = acpi_power_on(tl->handles[i]); diff -Nru a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c --- a/drivers/acpi/resources/rsmemory.c Thu Feb 27 01:44:27 2003 +++ b/drivers/acpi/resources/rsmemory.c Thu Feb 27 01:44:27 2003 @@ -278,7 +278,7 @@ /* * Point to the place in the output buffer where the data portion will * begin. - * 1. Set the RESOURCE_DATA * Data to point to it's own address, then + * 1. Set the RESOURCE_DATA * Data to point to its own address, then * 2. Set the pointer to the next address. * * NOTE: output_struct->Data is cast to u8, otherwise, this addition adds diff -Nru a/drivers/atm/firestream.c b/drivers/atm/firestream.c --- a/drivers/atm/firestream.c Thu Feb 27 01:44:18 2003 +++ b/drivers/atm/firestream.c Thu Feb 27 01:44:18 2003 @@ -105,7 +105,7 @@ The FS50 CAM (VP/VC match registers) always take the lowest channel number that matches. This is not a problem. - However, they also ignore wether the channel is enabled or + However, they also ignore whether the channel is enabled or not. This means that if you allocate channel 0 to 1.2 and then channel 1 to 0.0, then disabeling channel 0 and writing 0 to the match channel for channel 0 will "steal" the traffic from channel diff -Nru a/drivers/atm/horizon.c b/drivers/atm/horizon.c --- a/drivers/atm/horizon.c Thu Feb 27 01:44:16 2003 +++ b/drivers/atm/horizon.c Thu Feb 27 01:44:16 2003 @@ -2874,11 +2874,7 @@ // writes to adapter memory (handles IRQ and SMP) spin_lock_init (&dev->mem_lock); -#if LINUX_VERSION_CODE >= 0x20303 init_waitqueue_head (&dev->tx_queue); -#else - dev->tx_queue = 0; -#endif // vpi in 0..4, vci in 6..10 dev->atm_dev->ci_range.vpi_bits = vpi_bits; diff -Nru a/drivers/atm/horizon.h b/drivers/atm/horizon.h --- a/drivers/atm/horizon.h Thu Feb 27 01:44:30 2003 +++ b/drivers/atm/horizon.h Thu Feb 27 01:44:30 2003 @@ -422,11 +422,7 @@ unsigned int tx_regions; // number of remaining regions spinlock_t mem_lock; -#if LINUX_VERSION_CODE >= 0x20303 wait_queue_head_t tx_queue; -#else - struct wait_queue * tx_queue; -#endif u8 irq; long flags; diff -Nru a/drivers/atm/iphase.c b/drivers/atm/iphase.c --- a/drivers/atm/iphase.c Thu Feb 27 01:44:30 2003 +++ b/drivers/atm/iphase.c Thu Feb 27 01:44:30 2003 @@ -436,7 +436,7 @@ if (crm == 0) crm = 1; f_abr_vc->f_crm = crm & 0xff; f_abr_vc->f_pcr = cellrate_to_float(srv_p->pcr); - icr = MIN( srv_p->icr, (srv_p->tbe > srv_p->frtt) ? + icr = min( srv_p->icr, (srv_p->tbe > srv_p->frtt) ? ((srv_p->tbe/srv_p->frtt)*1000000) : (1000000/(srv_p->frtt/srv_p->tbe))); f_abr_vc->f_icr = cellrate_to_float(icr); @@ -2071,7 +2071,7 @@ - UBR Table size is 4K - UBR wait queue is 4K since the table and wait queues are contiguous, all the bytes - can be intialized by one memeset. + can be initialized by one memeset. */ vcsize_sel = 0; diff -Nru a/drivers/atm/iphase.h b/drivers/atm/iphase.h --- a/drivers/atm/iphase.h Thu Feb 27 01:44:20 2003 +++ b/drivers/atm/iphase.h Thu Feb 27 01:44:20 2003 @@ -808,7 +808,6 @@ } r_vc_abr_entry; #define MRM 3 -#define MIN(x,y) ((x) < (y)) ? (x) : (y) typedef struct srv_cls_param { u32 class_type; /* CBR/VBR/ABR/UBR; use the enum above */ @@ -1017,13 +1016,8 @@ spinlock_t tx_lock; IARTN_Q tx_return_q; u32 close_pending; -#if LINUX_VERSION_CODE >= 0x20303 wait_queue_head_t close_wait; wait_queue_head_t timeout_wait; -#else - struct wait_queue *close_wait; - struct wait_queue *timeout_wait; -#endif struct cpcs_trailer_desc *tx_buf; u16 num_tx_desc, tx_buf_sz, rate_limit; u32 tx_cell_cnt, tx_pkt_cnt; diff -Nru a/drivers/atm/lanai.c b/drivers/atm/lanai.c --- a/drivers/atm/lanai.c Thu Feb 27 01:44:20 2003 +++ b/drivers/atm/lanai.c Thu Feb 27 01:44:20 2003 @@ -1300,7 +1300,7 @@ #define DESCRIPTOR_AAL5_STREAM (0x00004000) #define DESCRIPTOR_CLP (0x00002000) -/* Add 32-bit descriptor with it's padding */ +/* Add 32-bit descriptor with its padding */ static inline void vcc_tx_add_aal5_descriptor(struct lanai_vcc *lvcc, u32 flags, int len) { diff -Nru a/drivers/base/bus.c b/drivers/base/bus.c --- a/drivers/base/bus.c Thu Feb 27 01:44:20 2003 +++ b/drivers/base/bus.c Thu Feb 27 01:44:20 2003 @@ -459,7 +459,7 @@ * @drv: driver. * * Detach the driver from the devices it controls, and remove - * it from it's bus's list of drivers. Finally, we drop the reference + * it from its bus's list of drivers. Finally, we drop the reference * to the bus we took in bus_add_driver(). */ diff -Nru a/drivers/block/cciss.c b/drivers/block/cciss.c --- a/drivers/block/cciss.c Thu Feb 27 01:44:30 2003 +++ b/drivers/block/cciss.c Thu Feb 27 01:44:30 2003 @@ -351,7 +351,7 @@ if (ctlr >= MAX_CTLR || hba[ctlr] == NULL) return -ENXIO; /* - * Root is allowed to open raw volume zero even if its not configured + * Root is allowed to open raw volume zero even if it's not configured * so array config can still work. I don't think I really like this, * but I'm already using way to many device nodes to claim another one * for "raw controller". diff -Nru a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c --- a/drivers/block/cciss_scsi.c Thu Feb 27 01:44:20 2003 +++ b/drivers/block/cciss_scsi.c Thu Feb 27 01:44:20 2003 @@ -210,7 +210,7 @@ stk = &sa->cmd_stack; size = sizeof(struct cciss_scsi_cmd_stack_elem_t) * CMD_STACK_SIZE; - // pci_alloc_consistent guarentees 32-bit DMA address will + // pci_alloc_consistent guarantees 32-bit DMA address will // be used stk->pool = (struct cciss_scsi_cmd_stack_elem_t *) diff -Nru a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c --- a/drivers/block/cpqarray.c Thu Feb 27 01:44:19 2003 +++ b/drivers/block/cpqarray.c Thu Feb 27 01:44:19 2003 @@ -715,7 +715,7 @@ return -ENXIO; /* - * Root is allowed to open raw volume zero even if its not configured + * Root is allowed to open raw volume zero even if it's not configured * so array config can still work. I don't think I really like this, * but I'm already using way to many device nodes to claim another one * for "raw controller". diff -Nru a/drivers/block/genhd.c b/drivers/block/genhd.c --- a/drivers/block/genhd.c Thu Feb 27 01:44:23 2003 +++ b/drivers/block/genhd.c Thu Feb 27 01:44:23 2003 @@ -1,17 +1,5 @@ /* - * Code extracted from - * linux/kernel/hd.c - * - * Copyright (C) 1991-1998 Linus Torvalds - * - * devfs support - jj, rgooch, 980122 - * - * Moved partition checking code to fs/partitions* - Russell King - * (linux@arm.uk.linux.org) - */ - -/* - * TODO: rip out the remaining init crap from this file --hch + * gendisk handling */ #include @@ -29,8 +17,9 @@ static struct subsystem block_subsys; +#define MAX_PROBE_HASH 23 /* random */ -struct blk_probe { +static struct blk_probe { struct blk_probe *next; dev_t dev; unsigned long range; @@ -38,21 +27,27 @@ struct gendisk *(*get)(dev_t dev, int *part, void *data); int (*lock)(dev_t, void *); void *data; -} *probes[MAX_BLKDEV]; +} *probes[MAX_PROBE_HASH]; -/* index in the above */ +/* index in the above - for now: assume no multimajor ranges */ static inline int dev_to_index(dev_t dev) { - return MAJOR(dev); + return MAJOR(dev) % MAX_PROBE_HASH; } +/* + * Register device numbers dev..(dev+range-1) + * range must be nonzero + * The hash chain is sorted on range, so that subranges can override. + */ void blk_register_region(dev_t dev, unsigned long range, struct module *module, - struct gendisk *(*probe)(dev_t, int *, void *), - int (*lock)(dev_t, void *), void *data) + struct gendisk *(*probe)(dev_t, int *, void *), + int (*lock)(dev_t, void *), void *data) { int index = dev_to_index(dev); struct blk_probe *p = kmalloc(sizeof(struct blk_probe), GFP_KERNEL); struct blk_probe **s; + p->owner = module; p->get = probe; p->lock = lock; @@ -71,6 +66,7 @@ { int index = dev_to_index(dev); struct blk_probe **s; + down_write(&block_subsys.rwsem); for (s = &probes[index]; *s; s = &(*s)->next) { struct blk_probe *p = *s; @@ -94,6 +90,7 @@ static int exact_lock(dev_t dev, void *data) { struct gendisk *p = data; + if (!get_disk(p)) return -1; return 0; @@ -109,14 +106,14 @@ void add_disk(struct gendisk *disk) { disk->flags |= GENHD_FL_UP; - blk_register_region(MKDEV(disk->major, disk->first_minor), disk->minors, - NULL, exact_match, exact_lock, disk); + blk_register_region(MKDEV(disk->major, disk->first_minor), + disk->minors, NULL, exact_match, exact_lock, disk); register_disk(disk); elv_register_queue(disk); } EXPORT_SYMBOL(add_disk); -EXPORT_SYMBOL(del_gendisk); +EXPORT_SYMBOL(del_gendisk); /* in partitions/check.c */ void unlink_gendisk(struct gendisk *disk) { @@ -146,18 +143,17 @@ struct gendisk *(*probe)(dev_t, int *, void *); struct module *owner; void *data; - if (p->dev > dev || p->dev + p->range <= dev) + + if (p->dev > dev || p->dev + p->range - 1 < dev) continue; - if (p->range >= best) { - up_read(&block_subsys.rwsem); - return NULL; - } + if (p->range - 1 >= best) + break; if (!try_module_get(p->owner)) continue; owner = p->owner; data = p->data; probe = p->get; - best = p->range; + best = p->range - 1; *part = dev - p->dev; if (p->lock && p->lock(dev, data) < 0) { module_put(owner); @@ -169,7 +165,7 @@ module_put(owner); if (disk) return disk; - goto retry; + goto retry; /* this terminates: best decreases */ } up_read(&block_subsys.rwsem); return NULL; @@ -245,7 +241,7 @@ static struct gendisk *base_probe(dev_t dev, int *part, void *data) { - char name[20]; + char name[30]; sprintf(name, "block-major-%d", MAJOR(dev)); request_module(name); return NULL; @@ -256,11 +252,11 @@ struct blk_probe *base = kmalloc(sizeof(struct blk_probe), GFP_KERNEL); int i; memset(base, 0, sizeof(struct blk_probe)); - base->dev = MKDEV(1,0); - base->range = MKDEV(MAX_BLKDEV-1, 255) - base->dev + 1; + base->dev = 1; + base->range = ~0; /* range 1 .. ~0 */ base->get = base_probe; - for (i = 1; i < MAX_BLKDEV; i++) - probes[i] = base; + for (i = 0; i < MAX_PROBE_HASH; i++) + probes[i] = base; /* must remain last in chain */ blk_dev_init(); subsystem_register(&block_subsys); return 0; @@ -281,12 +277,14 @@ ssize_t (*show)(struct gendisk *, char *); }; -static ssize_t disk_attr_show(struct kobject * kobj, struct attribute * attr, - char * page) +static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr, + char *page) { - struct gendisk * disk = to_disk(kobj); - struct disk_attribute * disk_attr = container_of(attr,struct disk_attribute,attr); + struct gendisk *disk = to_disk(kobj); + struct disk_attribute *disk_attr = + container_of(attr,struct disk_attribute,attr); ssize_t ret = 0; + if (disk_attr->show) ret = disk_attr->show(disk,page); return ret; @@ -303,11 +301,11 @@ } static ssize_t disk_range_read(struct gendisk * disk, char *page) { - return sprintf(page, "%d\n",disk->minors); + return sprintf(page, "%d\n", disk->minors); } static ssize_t disk_size_read(struct gendisk * disk, char *page) { - return sprintf(page, "%llu\n",(unsigned long long)get_capacity(disk)); + return sprintf(page, "%llu\n", (unsigned long long)get_capacity(disk)); } static inline unsigned jiffies_to_msec(unsigned jif) diff -Nru a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c --- a/drivers/block/ll_rw_blk.c Thu Feb 27 01:44:18 2003 +++ b/drivers/block/ll_rw_blk.c Thu Feb 27 01:44:18 2003 @@ -1461,6 +1461,7 @@ if (blk_rq_tagged(rq)) blk_queue_end_tag(q, rq); + drive_stat_acct(rq, rq->nr_sectors, 1); __elv_add_request(q, rq, !at_head, 0); q->request_fn(q); spin_unlock_irqrestore(q->queue_lock, flags); @@ -1892,7 +1893,7 @@ } /** - * generic_make_request: hand a buffer to it's device driver for I/O + * generic_make_request: hand a buffer to its device driver for I/O * @bio: The bio describing the location in memory and on the device. * * generic_make_request() is used to make I/O requests of block diff -Nru a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c --- a/drivers/block/scsi_ioctl.c Thu Feb 27 01:44:31 2003 +++ b/drivers/block/scsi_ioctl.c Thu Feb 27 01:44:31 2003 @@ -60,6 +60,7 @@ rq->flags |= REQ_NOMERGE; rq->waiting = &wait; + drive_stat_acct(rq, rq->nr_sectors, 1); elv_add_request(q, rq, 1, 1); generic_unplug_device(q); wait_for_completion(&wait); diff -Nru a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c --- a/drivers/cdrom/cdrom.c Thu Feb 27 01:44:19 2003 +++ b/drivers/cdrom/cdrom.c Thu Feb 27 01:44:19 2003 @@ -172,7 +172,7 @@ -- Defined CD_DVD and CD_CHANGER log levels. -- Fixed the CDROMREADxxx ioctls. -- CDROMPLAYTRKIND uses the GPCMD_PLAY_AUDIO_MSF command - too few - drives supported it. We loose the index part, however. + drives supported it. We lose the index part, however. -- Small modifications to accomodate opens of /dev/hdc1, required for ide-cd to handle multisession discs. -- Export cdrom_mode_sense and cdrom_mode_select. diff -Nru a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c --- a/drivers/cdrom/sbpcd.c Thu Feb 27 01:44:19 2003 +++ b/drivers/cdrom/sbpcd.c Thu Feb 27 01:44:19 2003 @@ -341,7 +341,7 @@ * Trying to merge requests breaks this driver horribly (as in it goes * boom and apparently has done so since 2.3.41). As it is a legacy * driver for a horribly slow double speed CD on a hideous interface - * designed for polled operation, I won't loose any sleep in simply + * designed for polled operation, I won't lose any sleep in simply * disallowing merging. Paul G. 02/2001 * * Thu May 30 14:14:47 CEST 2002: diff -Nru a/drivers/char/cyclades.c b/drivers/char/cyclades.c --- a/drivers/char/cyclades.c Thu Feb 27 01:44:20 2003 +++ b/drivers/char/cyclades.c Thu Feb 27 01:44:20 2003 @@ -151,7 +151,7 @@ * Revision 2.2.1.4 1998/08/04 11:02:50 ivan * /proc/cyclades implementation with great collaboration of * Marc Lewis ; - * cyy_interrupt was changed to avoid occurence of kernel oopses + * cyy_interrupt was changed to avoid occurrence of kernel oopses * during PPP operation. * * Revision 2.2.1.3 1998/06/01 12:09:10 ivan diff -Nru a/drivers/char/drm/drm_vm.h b/drivers/char/drm/drm_vm.h --- a/drivers/char/drm/drm_vm.h Thu Feb 27 01:44:31 2003 +++ b/drivers/char/drm/drm_vm.h Thu Feb 27 01:44:31 2003 @@ -147,7 +147,7 @@ } /* Special close routine which deletes map information if we are the last - * person to close a mapping and its not in the global maplist. + * person to close a mapping and it's not in the global maplist. */ void DRM(vm_shm_close)(struct vm_area_struct *vma) diff -Nru a/drivers/char/epca.c b/drivers/char/epca.c --- a/drivers/char/epca.c Thu Feb 27 01:44:24 2003 +++ b/drivers/char/epca.c Thu Feb 27 01:44:24 2003 @@ -897,7 +897,7 @@ Remember copy_from_user WILL generate a page fault if the user memory being accessed has been swapped out. This can cause this routine to temporarily sleep while this page - fault is occuring. + fault is occurring. ----------------------------------------------------------------- */ @@ -1865,7 +1865,7 @@ case PCXI: board_id = inb((int)bd->port); if ((board_id & 0x1) == 0x1) - { /* Begin its an XI card */ + { /* Begin it's an XI card */ /* Is it a 64K board */ if ((board_id & 0x30) == 0) @@ -2743,11 +2743,11 @@ /* --------------------------------------------------------------- Command sets channels iflag structure on the board. Such things - as input soft flow control, handeling of parity errors, and - break handeling are all set here. + as input soft flow control, handling of parity errors, and + break handling are all set here. ------------------------------------------------------------------- */ - /* break handeling, parity handeling, input stripping, flow control chars */ + /* break handling, parity handling, input stripping, flow control chars */ fepcmd(ch, SETIFLAGS, (unsigned int) ch->fepiflag, 0, 0, 0); } @@ -3516,7 +3516,7 @@ /* ------------------------------------------------------------------ The below routines pc_throttle and pc_unthrottle are used to slow (And resume) the receipt of data into the kernels - receive buffers. The exact occurence of this depends on the + receive buffers. The exact occurrence of this depends on the size of the kernels receive buffer and what the 'watermarks' are set to for that buffer. See the n_ttys.c file for more details. diff -Nru a/drivers/char/ftape/lowlevel/ftape-calibr.c b/drivers/char/ftape/lowlevel/ftape-calibr.c --- a/drivers/char/ftape/lowlevel/ftape-calibr.c Thu Feb 27 01:44:21 2003 +++ b/drivers/char/ftape/lowlevel/ftape-calibr.c Thu Feb 27 01:44:21 2003 @@ -56,7 +56,7 @@ * used directly to implement fine-grained timeouts. However, on * Alpha PCs, the 8254 is *not* used to implement the clock tick * (which is 1024 Hz, normally) and the 8254 timer runs at some - * "random" frequency (it seems to run at 18Hz, but its not safe to + * "random" frequency (it seems to run at 18Hz, but it's not safe to * rely on this value). Instead, we use the Alpha's "rpcc" * instruction to read cycle counts. As this is a 32 bit counter, * it will overflow only once per 30 seconds (on a 200MHz machine), diff -Nru a/drivers/char/ftape/lowlevel/ftape_syms.c b/drivers/char/ftape/lowlevel/ftape_syms.c --- a/drivers/char/ftape/lowlevel/ftape_syms.c Thu Feb 27 01:44:21 2003 +++ b/drivers/char/ftape/lowlevel/ftape_syms.c Thu Feb 27 01:44:21 2003 @@ -22,7 +22,7 @@ * * This file contains the symbols that the ftape low level * part of the QIC-40/80/3010/3020 floppy-tape driver "ftape" - * exports to it's high level clients + * exports to its high level clients */ #include diff -Nru a/drivers/char/ftape/zftape/zftape-vtbl.h b/drivers/char/ftape/zftape/zftape-vtbl.h --- a/drivers/char/ftape/zftape/zftape-vtbl.h Thu Feb 27 01:44:22 2003 +++ b/drivers/char/ftape/zftape/zftape-vtbl.h Thu Feb 27 01:44:22 2003 @@ -176,7 +176,7 @@ const zft_position *pos); /* this function decrements the zft_seg_pos counter if we are right - * at the beginning of a segment. This is to handel fsfm/bsfm -- we + * at the beginning of a segment. This is to handle fsfm/bsfm -- we * need to position before the eof mark. NOTE: zft_tape_pos is not * changed */ diff -Nru a/drivers/char/ftape/zftape/zftape-write.c b/drivers/char/ftape/zftape/zftape-write.c --- a/drivers/char/ftape/zftape/zftape-write.c Thu Feb 27 01:44:23 2003 +++ b/drivers/char/ftape/zftape/zftape-write.c Thu Feb 27 01:44:23 2003 @@ -357,7 +357,7 @@ *volume = zft_find_volume(pos->seg_pos); DUMP_VOLINFO(ft_t_noise, "", *volume); zft_just_before_eof = 0; - /* now merge with old data if neccessary */ + /* now merge with old data if necessary */ if (!zft_qic_mode && pos->seg_byte_pos != 0){ result = zft_fetch_segment(pos->seg_pos, zft_deblock_buf, diff -Nru a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c --- a/drivers/char/hangcheck-timer.c Thu Feb 27 01:44:22 2003 +++ b/drivers/char/hangcheck-timer.c Thu Feb 27 01:44:22 2003 @@ -16,7 +16,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have recieved a copy of the GNU General Public + * You should have received a copy of the GNU General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 021110-1307, USA. diff -Nru a/drivers/char/mwave/tp3780i.h b/drivers/char/mwave/tp3780i.h --- a/drivers/char/mwave/tp3780i.h Thu Feb 27 01:44:19 2003 +++ b/drivers/char/mwave/tp3780i.h Thu Feb 27 01:44:19 2003 @@ -72,7 +72,7 @@ #define TP_CFG_DisableLBusTimeout 0 /* Enable LBus timeout */ #define TP_CFG_N_Divisor 32 /* Clock = 39.1608 Mhz */ #define TP_CFG_M_Multiplier 37 /* " */ -#define TP_CFG_PllBypass 0 /* dont bypass */ +#define TP_CFG_PllBypass 0 /* don't bypass */ #define TP_CFG_ChipletEnable 0xFFFF /* Enable all chiplets */ typedef struct { diff -Nru a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c --- a/drivers/char/n_hdlc.c Thu Feb 27 01:44:21 2003 +++ b/drivers/char/n_hdlc.c Thu Feb 27 01:44:21 2003 @@ -833,7 +833,7 @@ poll_wait(filp, &tty->read_wait, wait); poll_wait(filp, &tty->write_wait, wait); - /* set bits for operations that wont block */ + /* set bits for operations that won't block */ if(n_hdlc->rx_buf_list.head) mask |= POLLIN | POLLRDNORM; /* readable */ if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) diff -Nru a/drivers/char/nvram.c b/drivers/char/nvram.c --- a/drivers/char/nvram.c Thu Feb 27 01:44:22 2003 +++ b/drivers/char/nvram.c Thu Feb 27 01:44:22 2003 @@ -606,7 +606,7 @@ #if MACH == COBALT -/* the cobalt CMOS has a wider range of it's checksum */ +/* the cobalt CMOS has a wider range of its checksum */ static int cobalt_check_checksum(void) { int i; diff -Nru a/drivers/char/nwflash.c b/drivers/char/nwflash.c --- a/drivers/char/nwflash.c Thu Feb 27 01:44:31 2003 +++ b/drivers/char/nwflash.c Thu Feb 27 01:44:31 2003 @@ -215,7 +215,7 @@ temp = ((int) (p + count) >> 16) - nBlock + 1; /* - * write ends at exactly 64k boundry? + * write ends at exactly 64k boundary? */ if (((int) (p + count) & 0xFFFF) == 0) temp -= 1; diff -Nru a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c --- a/drivers/char/pcmcia/synclink_cs.c Thu Feb 27 01:44:21 2003 +++ b/drivers/char/pcmcia/synclink_cs.c Thu Feb 27 01:44:22 2003 @@ -4505,7 +4505,7 @@ if (debug_level >= DEBUG_LEVEL_INFO) printk("mgslpc_sppp_rx_done(%s)\n",info->netname); if (skb == NULL) { - printk(KERN_NOTICE "%s: cant alloc skb, dropping packet\n", + printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", info->netname); info->netstats.rx_dropped++; return; diff -Nru a/drivers/char/rio/list.h b/drivers/char/rio/list.h --- a/drivers/char/rio/list.h Thu Feb 27 01:44:27 2003 +++ b/drivers/char/rio/list.h Thu Feb 27 01:44:27 2003 @@ -111,7 +111,7 @@ /* ** can_remove_receive( PacketP, PortP ) returns non-zero if PKT_IN_USE is set ** for the next packet on the queue. It will also set PacketP to point to the -** relevent packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear, +** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear, ** then can_remove_receive() returns 0. */ #if defined(MIPS) || defined(nx6000) || defined(drs6000) || defined(UWsparc) diff -Nru a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h --- a/drivers/char/rio/parmmap.h Thu Feb 27 01:44:28 2003 +++ b/drivers/char/rio/parmmap.h Thu Feb 27 01:44:28 2003 @@ -31,7 +31,7 @@ ---------------------------------------------------------------------------- Date By Description ---------------------------------------------------------------------------- -6/4/1991 jonb Made changes to accomodate Mips R3230 bus +6/4/1991 jonb Made changes to accommodate Mips R3230 bus ***************************************************************************/ #ifndef _parmap_h diff -Nru a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c --- a/drivers/char/rio/rio_linux.c Thu Feb 27 01:44:25 2003 +++ b/drivers/char/rio/rio_linux.c Thu Feb 27 01:44:25 2003 @@ -464,7 +464,7 @@ recursive calls will hang the machine in the interrupt routine. - hardware twiddling goes before "recursive". Otherwise when we - poll the card, and a recursive interrupt happens, we wont + poll the card, and a recursive interrupt happens, we won't ack the card, so it might keep on interrupting us. (especially level sensitive interrupt systems like PCI). diff -Nru a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c --- a/drivers/char/rio/rioinit.c Thu Feb 27 01:44:21 2003 +++ b/drivers/char/rio/rioinit.c Thu Feb 27 01:44:21 2003 @@ -145,7 +145,7 @@ p->RIOHosts[p->RIONumHosts].PaddrP = info->location; /* - ** Check that we are able to accomodate another host + ** Check that we are able to accommodate another host */ if ( p->RIONumHosts >= RIO_HOSTS ) { diff -Nru a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c --- a/drivers/char/rio/rioparam.c Thu Feb 27 01:44:31 2003 +++ b/drivers/char/rio/rioparam.c Thu Feb 27 01:44:31 2003 @@ -714,7 +714,7 @@ /* ** can_remove_receive(PktP,P) returns non-zero if PKT_IN_USE is set ** for the next packet on the queue. It will also set PktP to point to the -** relevent packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear, +** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear, ** then can_remove_receive() returns 0. */ int diff -Nru a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c --- a/drivers/char/rio/rioroute.c Thu Feb 27 01:44:24 2003 +++ b/drivers/char/rio/rioroute.c Thu Feb 27 01:44:24 2003 @@ -521,7 +521,7 @@ /* ** If either of the modules on this unit is read-only or write-only ** or none-xprint, then we need to transfer that info over to the - ** relevent ports. + ** relevant ports. */ if ( HostP->Mapping[ThisUnit].SysPort != NO_PORT ) { @@ -976,7 +976,7 @@ /* ** We loop for all entries even after finding an entry and ** zeroing it because we may have two entries to delete if - ** its a 16 port RTA. + ** it's a 16 port RTA. */ for (entry = 0; entry < TOTAL_MAP_ENTRIES; entry++) { diff -Nru a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c --- a/drivers/char/rio/riotable.c Thu Feb 27 01:44:30 2003 +++ b/drivers/char/rio/riotable.c Thu Feb 27 01:44:30 2003 @@ -309,7 +309,7 @@ } /* - ** wow! if we get here then its a goody! + ** wow! if we get here then it's a goody! */ /* diff -Nru a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c --- a/drivers/char/rio/riotty.c Thu Feb 27 01:44:22 2003 +++ b/drivers/char/rio/riotty.c Thu Feb 27 01:44:22 2003 @@ -737,10 +737,10 @@ RIOCookMode(struct ttystatics *tp) { /* - ** We cant handle tm.c_mstate != 0 on SCO - ** We cant handle mapping - ** We cant handle non-ttwrite line disc. - ** We cant handle lflag XCASE + ** We can't handle tm.c_mstate != 0 on SCO + ** We can't handle mapping + ** We can't handle non-ttwrite line disc. + ** We can't handle lflag XCASE ** We can handle oflag OPOST & (OCRNL, ONLCR, TAB3) */ diff -Nru a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h --- a/drivers/char/rocket_int.h Thu Feb 27 01:44:19 2003 +++ b/drivers/char/rocket_int.h Thu Feb 27 01:44:19 2003 @@ -834,7 +834,7 @@ /*************************************************************************** Function: sInitChanDefaults -Purpose: Initialize a channel structure to it's default state. +Purpose: Initialize a channel structure to its default state. Call: sInitChanDefaults(ChP) CHANNEL_T *ChP; Ptr to the channel structure Comments: This function must be called once for every channel structure diff -Nru a/drivers/char/scc.h b/drivers/char/scc.h --- a/drivers/char/scc.h Thu Feb 27 01:44:27 2003 +++ b/drivers/char/scc.h Thu Feb 27 01:44:27 2003 @@ -428,7 +428,7 @@ * for that purpose. They assume that a local variable 'port' is * declared and pointing to the port's scc_struct entry. The * variants with "_NB" appended should be used if no other SCC - * accesses follow immediatly (within 0.5 usecs). They just skip the + * accesses follow immediately (within 0.5 usecs). They just skip the * final delay nops. * * Please note that accesses to SCC registers should only take place diff -Nru a/drivers/char/ser_a2232.c b/drivers/char/ser_a2232.c --- a/drivers/char/ser_a2232.c Thu Feb 27 01:44:21 2003 +++ b/drivers/char/ser_a2232.c Thu Feb 27 01:44:21 2003 @@ -590,7 +590,7 @@ printk("A2232: 65EC02 software sent SYNC event, don't know what to do. Ignoring."); break; default: - printk("A2232: 65EC02 software broken, unknown event type %d occured.\n",ibuf[bufpos-1]); + printk("A2232: 65EC02 software broken, unknown event type %d occurred.\n",ibuf[bufpos-1]); } /* event type switch */ break; case A2232INCTL_CHAR: @@ -599,7 +599,7 @@ bufpos++; break; default: - printk("A2232: 65EC02 software broken, unknown data type %d occured.\n",cbuf[bufpos]); + printk("A2232: 65EC02 software broken, unknown data type %d occurred.\n",cbuf[bufpos]); bufpos++; } /* switch on input data type */ } /* while there's something in the buffer */ diff -Nru a/drivers/char/sx.c b/drivers/char/sx.c --- a/drivers/char/sx.c Thu Feb 27 01:44:22 2003 +++ b/drivers/char/sx.c Thu Feb 27 01:44:22 2003 @@ -1216,7 +1216,7 @@ recursive calls will hang the machine in the interrupt routine. - hardware twiddling goes before "recursive". Otherwise when we - poll the card, and a recursive interrupt happens, we wont + poll the card, and a recursive interrupt happens, we won't ack the card, so it might keep on interrupting us. (especially level sensitive interrupt systems like PCI). diff -Nru a/drivers/char/synclink.c b/drivers/char/synclink.c --- a/drivers/char/synclink.c Thu Feb 27 01:44:22 2003 +++ b/drivers/char/synclink.c Thu Feb 27 01:44:22 2003 @@ -4260,7 +4260,7 @@ if ( info->tx_holding_count ) { /* determine if we have enough tx dma buffers - * to accomodate the next tx frame + * to accommodate the next tx frame */ struct tx_holding_buffer *ptx = &info->tx_holding_buffers[info->get_tx_holding_index]; @@ -7621,7 +7621,7 @@ status = info->rx_buffer_list[0].status; if ( status & (BIT8 + BIT3 + BIT1) ) { - /* receive error has occured */ + /* receive error has occurred */ rc = FALSE; } else { if ( memcmp( info->tx_buffer_list[0].virt_addr , @@ -8103,7 +8103,7 @@ if (debug_level >= DEBUG_LEVEL_INFO) printk("mgsl_sppp_rx_done(%s)\n",info->netname); if (skb == NULL) { - printk(KERN_NOTICE "%s: cant alloc skb, dropping packet\n", + printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", info->netname); info->netstats.rx_dropped++; return; diff -Nru a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c --- a/drivers/char/synclinkmp.c Thu Feb 27 01:44:20 2003 +++ b/drivers/char/synclinkmp.c Thu Feb 27 01:44:20 2003 @@ -1829,7 +1829,7 @@ if (debug_level >= DEBUG_LEVEL_INFO) printk("sppp_rx_done(%s)\n",info->netname); if (skb == NULL) { - printk(KERN_NOTICE "%s: cant alloc skb, dropping packet\n", + printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n", info->netname); info->netstats.rx_dropped++; return; diff -Nru a/drivers/char/vt.c b/drivers/char/vt.c --- a/drivers/char/vt.c Thu Feb 27 01:44:28 2003 +++ b/drivers/char/vt.c Thu Feb 27 01:44:28 2003 @@ -1882,7 +1882,7 @@ buf = con_buf; } - /* At this point 'buf' is guarenteed to be a kernel buffer + /* At this point 'buf' is guaranteed to be a kernel buffer * and therefore no access to userspace (and therefore sleeping) * will be needed. The con_buf_sem serializes all tty based * console rendering and vcs write/read operations. We hold @@ -2872,7 +2872,7 @@ * this is done in order to maintain compatibility with the EGA/VGA fonts. It * is upto the actual low-level console-driver convert data into its favorite * format (maybe we should add a `fontoffset' field to the `display' - * structure so we wont have to convert the fontdata all the time. + * structure so we won't have to convert the fontdata all the time. * /Jes */ diff -Nru a/drivers/char/watchdog/i810-tco.c b/drivers/char/watchdog/i810-tco.c --- a/drivers/char/watchdog/i810-tco.c Thu Feb 27 01:44:17 2003 +++ b/drivers/char/watchdog/i810-tco.c Thu Feb 27 01:44:17 2003 @@ -161,7 +161,7 @@ } /* - * Reload (trigger) the timer. Lock is needed so we dont reload it during + * Reload (trigger) the timer. Lock is needed so we don't reload it during * a reprogramming event */ @@ -218,7 +218,7 @@ tco_expect_close = 0; - /* scan to see wether or not we got the magic character */ + /* scan to see whether or not we got the magic character */ for (i = 0; i != len; i++) { u8 c; if(get_user(c, data+i)) diff -Nru a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c --- a/drivers/char/watchdog/sbc60xxwdt.c Thu Feb 27 01:44:26 2003 +++ b/drivers/char/watchdog/sbc60xxwdt.c Thu Feb 27 01:44:26 2003 @@ -50,7 +50,7 @@ * * Why `V' ? Well, `V' is the character in ASCII for the value 86, * and we all know that 86 is _the_ most random number in the universe. - * Therefore it is the letter that has the slightest chance of occuring + * Therefore it is the letter that has the slightest chance of occurring * by chance, when the system becomes corrupted. * */ diff -Nru a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c --- a/drivers/char/watchdog/wdt.c Thu Feb 27 01:44:23 2003 +++ b/drivers/char/watchdog/wdt.c Thu Feb 27 01:44:23 2003 @@ -175,7 +175,7 @@ * * Handle an interrupt from the board. These are raised when the status * map changes in what the board considers an interesting way. That means - * a failure condition occuring. + * a failure condition occurring. */ void wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) diff -Nru a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c --- a/drivers/char/watchdog/wdt_pci.c Thu Feb 27 01:44:25 2003 +++ b/drivers/char/watchdog/wdt_pci.c Thu Feb 27 01:44:25 2003 @@ -158,7 +158,7 @@ * * Handle an interrupt from the board. These are raised when the status * map changes in what the board considers an interesting way. That means - * a failure condition occuring. + * a failure condition occurring. */ static void wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs) diff -Nru a/drivers/hotplug/acpiphp_glue.c b/drivers/hotplug/acpiphp_glue.c --- a/drivers/hotplug/acpiphp_glue.c Thu Feb 27 01:44:21 2003 +++ b/drivers/hotplug/acpiphp_glue.c Thu Feb 27 01:44:21 2003 @@ -1357,7 +1357,7 @@ if (sta != ACPI_STA_ALL) { retval = acpiphp_disable_slot(slot); if (retval) { - err("Error occured in enabling\n"); + err("Error occurred in enabling\n"); up(&slot->crit_sect); goto err_exit; } @@ -1368,7 +1368,7 @@ if (sta == ACPI_STA_ALL) { retval = acpiphp_enable_slot(slot); if (retval) { - err("Error occured in enabling\n"); + err("Error occurred in enabling\n"); up(&slot->crit_sect); goto err_exit; } diff -Nru a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c --- a/drivers/hotplug/ibmphp_core.c Thu Feb 27 01:44:31 2003 +++ b/drivers/hotplug/ibmphp_core.c Thu Feb 27 01:44:31 2003 @@ -1343,12 +1343,12 @@ } /* Check to see the error of why it failed */ if ((SLOT_POWER (slot_cur->status)) && !(SLOT_PWRGD (slot_cur->status))) - err ("power fault occured trying to power up \n"); + err ("power fault occurred trying to power up \n"); else if (SLOT_BUS_SPEED (slot_cur->status)) { - err ("bus speed mismatch occured. please check current bus speed and card capability \n"); + err ("bus speed mismatch occurred. please check current bus speed and card capability \n"); print_card_capability (slot_cur); } else if (SLOT_BUS_MODE (slot_cur->ext_status)) { - err ("bus mode mismatch occured. please check current bus mode and card capability \n"); + err ("bus mode mismatch occurred. please check current bus mode and card capability \n"); print_card_capability (slot_cur); } ibmphp_update_slot_info (slot_cur); @@ -1376,10 +1376,10 @@ if (SLOT_POWER (slot_cur->status) && !(SLOT_PWRGD (slot_cur->status))) { faulted = 1; - err ("power fault occured trying to power up... \n"); + err ("power fault occurred trying to power up... \n"); } else if (SLOT_POWER (slot_cur->status) && (SLOT_BUS_SPEED (slot_cur->status))) { faulted = 1; - err ("bus speed mismatch occured. please check current bus speed and card capability \n"); + err ("bus speed mismatch occurred. please check current bus speed and card capability \n"); print_card_capability (slot_cur); } /* Don't think this case will happen after above checks... but just in case, for paranoia sake */ diff -Nru a/drivers/hotplug/ibmphp_res.c b/drivers/hotplug/ibmphp_res.c --- a/drivers/hotplug/ibmphp_res.c Thu Feb 27 01:44:28 2003 +++ b/drivers/hotplug/ibmphp_res.c Thu Feb 27 01:44:28 2003 @@ -740,7 +740,7 @@ res->nextRange = NULL; } } else { - /* this is the case where it is 1st occurence of the range */ + /* this is the case where it is 1st occurrence of the range */ if (!res_prev) { /* at the beginning of the resource list */ res->next = NULL; diff -Nru a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c --- a/drivers/i2c/busses/i2c-amd8111.c Thu Feb 27 01:44:27 2003 +++ b/drivers/i2c/busses/i2c-amd8111.c Thu Feb 27 01:44:27 2003 @@ -8,10 +8,8 @@ * the Free Software Foundation version 2. */ -#include #include #include -#include #include #include #include @@ -19,6 +17,7 @@ #include #include #include +#include MODULE_LICENSE("GPL"); MODULE_AUTHOR ("Vojtech Pavlik "); @@ -204,8 +203,6 @@ protocol |= AMD_SMB_PRTCL_BYTE_DATA; break; - case I2C_SMBUS_WORD_DATA_PEC: - protocol |= AMD_SMB_PRTCL_PEC; case I2C_SMBUS_WORD_DATA: amd_ec_write(smbus, AMD_SMB_CMD, command); if (read_write == I2C_SMBUS_WRITE) { @@ -215,8 +212,6 @@ protocol |= AMD_SMB_PRTCL_WORD_DATA | pec; break; - case I2C_SMBUS_BLOCK_DATA_PEC: - protocol |= AMD_SMB_PRTCL_PEC; case I2C_SMBUS_BLOCK_DATA: amd_ec_write(smbus, AMD_SMB_CMD, command); if (read_write == I2C_SMBUS_WRITE) { @@ -238,8 +233,6 @@ protocol |= AMD_SMB_PRTCL_I2C_BLOCK_DATA; break; - case I2C_SMBUS_PROC_CALL_PEC: - protocol |= AMD_SMB_PRTCL_PEC; case I2C_SMBUS_PROC_CALL: amd_ec_write(smbus, AMD_SMB_CMD, command); amd_ec_write(smbus, AMD_SMB_DATA, data->word); @@ -248,8 +241,6 @@ read_write = I2C_SMBUS_READ; break; - case I2C_SMBUS_BLOCK_PROC_CALL_PEC: - protocol |= AMD_SMB_PRTCL_PEC; case I2C_SMBUS_BLOCK_PROC_CALL: protocol |= pec; len = min_t(u8, data->block[0], 31); @@ -261,6 +252,13 @@ read_write = I2C_SMBUS_READ; break; + case I2C_SMBUS_WORD_DATA_PEC: + case I2C_SMBUS_BLOCK_DATA_PEC: + case I2C_SMBUS_PROC_CALL_PEC: + case I2C_SMBUS_BLOCK_PROC_CALL_PEC: + printk(KERN_WARNING "i2c-amd8111.c: Unexpected software PEC transaction %d\n.", size); + return -1; + default: printk(KERN_WARNING "i2c-amd8111.c: Unsupported transaction %d\n", size); return -1; @@ -296,18 +294,14 @@ break; case I2C_SMBUS_WORD_DATA: - case I2C_SMBUS_WORD_DATA_PEC: case I2C_SMBUS_PROC_CALL: - case I2C_SMBUS_PROC_CALL_PEC: amd_ec_read(smbus, AMD_SMB_DATA, temp + 0); amd_ec_read(smbus, AMD_SMB_DATA + 1, temp + 1); data->word = (temp[1] << 8) | temp[0]; break; case I2C_SMBUS_BLOCK_DATA: - case I2C_SMBUS_BLOCK_DATA_PEC: case I2C_SMBUS_BLOCK_PROC_CALL: - case I2C_SMBUS_BLOCK_PROC_CALL_PEC: amd_ec_read(smbus, AMD_SMB_BCNT, &len); len = min_t(u8, len, 32); case I2C_SMBUS_I2C_BLOCK_DATA: @@ -320,13 +314,12 @@ return 0; } + u32 amd8111_func(struct i2c_adapter *adapter) { return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA | - I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_WORD_DATA_PEC | - I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_BLOCK_DATA_PEC | - I2C_FUNC_SMBUS_PROC_CALL | I2C_FUNC_SMBUS_PROC_CALL_PEC | - I2C_FUNC_SMBUS_BLOCK_PROC_CALL | I2C_FUNC_SMBUS_BLOCK_PROC_CALL_PEC | + I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA | + I2C_FUNC_SMBUS_PROC_CALL | I2C_FUNC_SMBUS_BLOCK_PROC_CALL | I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_HWPEC_CALC; } @@ -337,78 +330,81 @@ .functionality = amd8111_func, }; + +static struct pci_device_id amd8111_ids[] __devinitdata = { + { 0x1022, 0x746a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { 0, } +}; + static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id) { struct amd_smbus *smbus; + int error = -ENODEV; if (~pci_resource_flags(dev, 0) & IORESOURCE_IO) - return -1; + return -ENODEV; - if (!(smbus = (void*)kmalloc(sizeof(struct amd_smbus), GFP_KERNEL))) - return -1; + smbus = kmalloc(sizeof(struct amd_smbus), GFP_KERNEL); + if (!smbus) + return -ENOMEM; memset(smbus, 0, sizeof(struct amd_smbus)); - pci_set_drvdata(dev, smbus); smbus->dev = dev; smbus->base = pci_resource_start(dev, 0); smbus->size = pci_resource_len(dev, 0); - if (!request_region(smbus->base, smbus->size, "amd8111 SMBus 2.0")) { - kfree(smbus); - return -1; - } + if (!request_region(smbus->base, smbus->size, "amd8111 SMBus 2.0")) + goto out_kfree; smbus->adapter.owner = THIS_MODULE; - sprintf(smbus->adapter.name, "SMBus2 AMD8111 adapter at %04x", smbus->base); + sprintf(smbus->adapter.name, + "SMBus2 AMD8111 adapter at %04x", smbus->base); smbus->adapter.id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_AMD8111; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus; - if (i2c_add_adapter(&smbus->adapter)) { - printk(KERN_WARNING "i2c-amd8111.c: Failed to register adapter.\n"); - release_region(smbus->base, smbus->size); - kfree(smbus); - return -1; - } + error = i2c_add_adapter(&smbus->adapter); + if (error) + goto out_release_region; pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0); - - printk(KERN_INFO "i2c-amd8111.c: AMD8111 SMBus 2.0 adapter at %#x\n", smbus->base); + pci_set_drvdata(dev, smbus); return 0; + + out_release_region: + release_region(smbus->base, smbus->size); + out_kfree: + kfree(smbus); + return -1; } + static void __devexit amd8111_remove(struct pci_dev *dev) { - struct amd_smbus *smbus = (void*) pci_get_drvdata(dev); - if (i2c_del_adapter(&smbus->adapter)) { - printk(KERN_WARNING "i2c-amd8111.c: Failed to unregister adapter.\n"); - return; - } + struct amd_smbus *smbus = pci_get_drvdata(dev); + + i2c_del_adapter(&smbus->adapter); release_region(smbus->base, smbus->size); kfree(smbus); } -static struct pci_device_id amd8111_id_table[] __devinitdata = -{{ 0x1022, 0x746a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - { 0 }}; - - static struct pci_driver amd8111_driver = { - .name = "amd8111 smbus 2.0", - .id_table = amd8111_id_table, - .probe = amd8111_probe, - .remove = __devexit_p(amd8111_remove), + .name = "amd8111 smbus 2.0", + .id_table = amd8111_ids, + .probe = amd8111_probe, + .remove = __devexit_p(amd8111_remove), }; -int __init amd8111_init(void) +static int __init i2c_amd8111_init(void) { return pci_module_init(&amd8111_driver); } -void __exit amd8111_exit(void) + +static void __exit i2c_amd8111_exit(void) { pci_unregister_driver(&amd8111_driver); } -module_init(amd8111_init); -module_exit(amd8111_exit); +module_init(i2c_amd8111_init); +module_exit(i2c_amd8111_exit); diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c --- a/drivers/i2c/chips/adm1021.c Thu Feb 27 01:44:17 2003 +++ b/drivers/i2c/chips/adm1021.c Thu Feb 27 01:44:17 2003 @@ -311,18 +311,14 @@ goto error3; /* Register a new directory entry with module sensors */ - if ((i = i2c_register_entry(new_client, - type_name, - data->type == - adm1021 ? - adm1021_dir_table_template : - adm1021_max_dir_table_template, - THIS_MODULE)) < 0) { - err = i; + err = i2c_register_entry(new_client, type_name, + (data->type == adm1021) ? + adm1021_dir_table_template : + adm1021_max_dir_table_template); + if (err < 0) goto error4; - } - data->sysctl_id = i; + data->sysctl_id = err; /* Initialize the ADM1021 chip */ adm1021_init_client(new_client); return 0; diff -Nru a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c --- a/drivers/i2c/chips/lm75.c Thu Feb 27 01:44:16 2003 +++ b/drivers/i2c/chips/lm75.c Thu Feb 27 01:44:16 2003 @@ -191,9 +191,8 @@ goto error3; /* Register a new directory entry with module sensors */ - if ((i = i2c_register_entry(new_client, type_name, - lm75_dir_table_template, - THIS_MODULE)) < 0) { + i = i2c_register_entry(new_client, type_name, lm75_dir_table_template); + if (i < 0) { err = i; goto error4; } diff -Nru a/drivers/i2c/i2c-adap-ite.c b/drivers/i2c/i2c-adap-ite.c --- a/drivers/i2c/i2c-adap-ite.c Thu Feb 27 01:44:20 2003 +++ b/drivers/i2c/i2c-adap-ite.c Thu Feb 27 01:44:20 2003 @@ -265,7 +265,7 @@ MODULE_PARM(i2c_debug,"i"); -/* Called when module is loaded or when kernel is intialized. +/* Called when module is loaded or when kernel is initialized. * If MODULES is defined when this file is compiled, then this function will * resolve to init_module (the function called when insmod is invoked for a * module). Otherwise, this function is called early in the boot, when the diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c --- a/drivers/i2c/i2c-algo-ibm_ocp.c Thu Feb 27 01:44:25 2003 +++ b/drivers/i2c/i2c-algo-ibm_ocp.c Thu Feb 27 01:44:25 2003 @@ -758,7 +758,7 @@ // Check to see if the bus is busy // ret = iic_inb(adap, iic->extsts); - // Mask off the irrelevent bits + // Mask off the irrelevant bits ret = ret & 0x70; // When the bus is free, the BCS bits in the EXTSTS register are 0b100 if(ret != 0x40) return IIC_ERR_LOST_ARB; diff -Nru a/drivers/i2c/i2c-algo-ite.c b/drivers/i2c/i2c-algo-ite.c --- a/drivers/i2c/i2c-algo-ite.c Thu Feb 27 01:44:29 2003 +++ b/drivers/i2c/i2c-algo-ite.c Thu Feb 27 01:44:29 2003 @@ -860,7 +860,7 @@ * is loaded via insmod) when this file is compiled with MODULES defined. * Otherwise (i.e. if you want this driver statically linked to the kernel), * a pointer to this function is stored in a table and called - * during the intialization of the kernel (in do_basic_setup in /init/main.c) + * during the initialization of the kernel (in do_basic_setup in /init/main.c) * * All this functionality is complements of the macros defined in linux/init.h */ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c --- a/drivers/i2c/i2c-core.c Thu Feb 27 01:44:19 2003 +++ b/drivers/i2c/i2c-core.c Thu Feb 27 01:44:19 2003 @@ -61,11 +61,9 @@ /**** adapter list */ static struct i2c_adapter *adapters[I2C_ADAP_MAX]; -static int adap_count; /**** drivers list */ static struct i2c_driver *drivers[I2C_DRIVER_MAX]; -static int driver_count; /**** debug level */ static int i2c_debug; @@ -116,7 +114,6 @@ } adapters[i] = adap; - adap_count++; ADAP_UNLOCK(); /* init data types */ @@ -161,7 +158,6 @@ ERROR1: ADAP_LOCK(); adapters[i] = NULL; - adap_count--; ERROR0: ADAP_UNLOCK(); return res; @@ -227,7 +223,6 @@ #endif /* def CONFIG_PROC_FS */ adapters[i] = NULL; - adap_count--; ADAP_UNLOCK(); DEB(printk(KERN_DEBUG "i2c-core.o: adapter unregistered: %s\n",adap->name)); @@ -265,7 +260,6 @@ } drivers[i] = driver; - driver_count++; DRV_UNLOCK(); /* driver was successfully added */ @@ -361,7 +355,6 @@ } ADAP_UNLOCK(); drivers[i] = NULL; - driver_count--; DRV_UNLOCK(); DEB(printk(KERN_DEBUG "i2c-core.o: driver unregistered: %s\n",driver->name)); @@ -465,73 +458,6 @@ module_put(client->adapter->owner); } -struct i2c_client *i2c_get_client(int driver_id, int adapter_id, - struct i2c_client *prev) -{ - int i,j; - - /* Will iterate through the list of clients in each adapter of adapters-list - in search for a client that matches the search criteria. driver_id or - adapter_id are ignored if set to 0. If both are ignored this returns - first client found. */ - - i = j = 0; - - /* set starting point */ - if(prev) - { - if(!(prev->adapter)) - return (struct i2c_client *) -EINVAL; - - for(j=0; j < I2C_ADAP_MAX; j++) - if(prev->adapter == adapters[j]) - break; - - /* invalid starting point? */ - if (I2C_ADAP_MAX == j) { - printk(KERN_WARNING " i2c-core.o: get_client adapter for client:[%s] not found\n", - prev->name); - return (struct i2c_client *) -ENODEV; - } - - for(i=0; i < I2C_CLIENT_MAX; i++) - if(prev == adapters[j]->clients[i]) - break; - - /* invalid starting point? */ - if (I2C_CLIENT_MAX == i) { - printk(KERN_WARNING " i2c-core.o: get_client client:[%s] not found\n", - prev->name); - return (struct i2c_client *) -ENODEV; - } - - i++; /* start from one after prev */ - } - - for(; j < I2C_ADAP_MAX; j++) - { - if(!adapters[j]) - continue; - - if(adapter_id && (adapters[j]->id != adapter_id)) - continue; - - for(; i < I2C_CLIENT_MAX; i++) - { - if(!adapters[j]->clients[i]) - continue; - - if(driver_id && (adapters[j]->clients[i]->driver->id != driver_id)) - continue; - if(adapters[j]->clients[i]->flags & I2C_CLIENT_ALLOW_USE) - return adapters[j]->clients[i]; - } - i = 0; - } - - return 0; -} - int i2c_use_client(struct i2c_client *client) { if (!i2c_inc_use_client(client)) @@ -1421,11 +1347,9 @@ EXPORT_SYMBOL(i2c_del_driver); EXPORT_SYMBOL(i2c_attach_client); EXPORT_SYMBOL(i2c_detach_client); -EXPORT_SYMBOL(i2c_get_client); EXPORT_SYMBOL(i2c_use_client); EXPORT_SYMBOL(i2c_release_client); EXPORT_SYMBOL(i2c_check_addr); - EXPORT_SYMBOL(i2c_master_send); EXPORT_SYMBOL(i2c_master_recv); diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c --- a/drivers/i2c/i2c-dev.c Thu Feb 27 01:44:27 2003 +++ b/drivers/i2c/i2c-dev.c Thu Feb 27 01:44:27 2003 @@ -77,6 +77,7 @@ static struct i2c_adapter *i2cdev_adaps[I2CDEV_ADAPS_MAX]; static struct i2c_driver i2cdev_driver = { + .owner = THIS_MODULE, .name = "i2c-dev dummy driver", .id = I2C_DRIVERID_I2CDEV, .flags = I2C_DF_DUMMY, @@ -340,47 +341,42 @@ return 0; } -int i2cdev_open (struct inode *inode, struct file *file) +static int i2cdev_open(struct inode *inode, struct file *file) { unsigned int minor = minor(inode->i_rdev); struct i2c_client *client; - if ((minor >= I2CDEV_ADAPS_MAX) || ! (i2cdev_adaps[minor])) { -#ifdef DEBUG - printk(KERN_DEBUG "i2c-dev.o: Trying to open unattached adapter i2c-%d\n", - minor); -#endif + if ((minor >= I2CDEV_ADAPS_MAX) || !(i2cdev_adaps[minor])) return -ENODEV; - } - /* Note that we here allocate a client for later use, but we will *not* - register this client! Yes, this is safe. No, it is not very clean. */ - if(! (client = kmalloc(sizeof(struct i2c_client),GFP_KERNEL))) + client = kmalloc(sizeof(*client), GFP_KERNEL); + if (!client) return -ENOMEM; - memcpy(client,&i2cdev_client_template,sizeof(struct i2c_client)); + memcpy(client, &i2cdev_client_template, sizeof(*client)); + + /* registered with adapter, passed as client to user */ client->adapter = i2cdev_adaps[minor]; file->private_data = client; - if (!try_module_get(i2cdev_adaps[minor]->owner)) { - kfree(client); - return -ENODEV; - } + /* use adapter module, i2c-dev handled with fops */ + if (!try_module_get(client->adapter->owner)) + goto out_kfree; -#ifdef DEBUG - printk(KERN_DEBUG "i2c-dev.o: opened i2c-%d\n",minor); -#endif return 0; + + out_kfree: + kfree(client); + return -ENODEV; } -static int i2cdev_release (struct inode *inode, struct file *file) +static int i2cdev_release(struct inode *inode, struct file *file) { - unsigned int minor = minor(inode->i_rdev); - kfree(file->private_data); - file->private_data=NULL; -#ifdef DEBUG - printk(KERN_DEBUG "i2c-dev.o: Closed: i2c-%d\n", minor); -#endif - module_put(i2cdev_adaps[minor]->owner); + struct i2c_client *client = file->private_data; + + module_put(client->adapter->owner); + kfree(client); + file->private_data = NULL; + return 0; } diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c --- a/drivers/i2c/i2c-proc.c Thu Feb 27 01:44:23 2003 +++ b/drivers/i2c/i2c-proc.c Thu Feb 27 01:44:23 2003 @@ -125,17 +125,12 @@ ctl_template should be a template of the newly created directory. It is copied in memory. The extra2 field of each file is set to point to client. If any driver wants subdirectories within the newly created directory, - this function must be updated! - controlling_mod is the controlling module. It should usually be - THIS_MODULE when calling. Note that this symbol is not defined in - kernels before 2.3.13; define it to NULL in that case. We will not use it - for anything older than 2.3.27 anyway. */ + this function must be updated! */ int i2c_register_entry(struct i2c_client *client, const char *prefix, - ctl_table * ctl_template, - struct module *controlling_mod) + ctl_table * ctl_template) { int i, res, len, id; - ctl_table *new_table; + ctl_table *new_table, *client_tbl, *tbl; char *name; struct ctl_table_header *new_header; @@ -150,26 +145,33 @@ kfree(name); return -ENOMEM; } - id += 256; + id += 256; + len = 0; while (ctl_template[len].procname) len++; - len += 7; - if (!(new_table = kmalloc(sizeof(ctl_table) * len, GFP_KERNEL))) { + if (!(new_table = kmalloc(sizeof(sysctl_table) + sizeof(ctl_table) * (len + 1), + GFP_KERNEL))) { kfree(name); return -ENOMEM; } - memcpy(new_table, sysctl_table, 6 * sizeof(ctl_table)); - new_table[0].child = &new_table[2]; - new_table[2].child = &new_table[4]; - new_table[4].child = &new_table[6]; - new_table[4].procname = name; - new_table[4].ctl_name = id; - memcpy(new_table + 6, ctl_template, (len - 6) * sizeof(ctl_table)); - for (i = 6; i < len; i++) - new_table[i].extra2 = client; + memcpy(new_table, sysctl_table, sizeof(sysctl_table)); + tbl = new_table; /* sys/ */ + tbl = tbl->child = tbl + 2; /* dev/ */ + tbl = tbl->child = tbl + 2; /* sensors/ */ + client_tbl = tbl->child = tbl + 2; /* XX-chip-YY-ZZ/ */ + + client_tbl->procname = name; + client_tbl->ctl_name = id; + client_tbl->child = client_tbl + 2; + + /* Next the client sysctls. --km */ + tbl = client_tbl->child; + memcpy(tbl, ctl_template, sizeof(ctl_table) * (len+1)); + for (i = 0; i < len; i++) + tbl[i].extra2 = client; if (!(new_header = register_sysctl_table(new_table, 0))) { printk(KERN_ERR "i2c-proc.o: error: sysctl interface not supported by kernel!\n"); @@ -178,21 +180,21 @@ return -EPERM; } - i2c_entries[id - 256] = new_header; + i2c_entries[id - 256] = new_header; i2c_clients[id - 256] = client; + #ifdef DEBUG if (!new_header || !new_header->ctl_table || !new_header->ctl_table->child || !new_header->ctl_table->child->child || - !new_header->ctl_table->child->child->de) { + !new_header->ctl_table->child->child->de ) { printk (KERN_ERR "i2c-proc.o: NULL pointer when trying to install fill_inode fix!\n"); return id; } #endif /* DEBUG */ - new_header->ctl_table->child->child->de->owner = controlling_mod; - + client_tbl->de->owner = client->driver->owner; return id; } @@ -515,7 +517,7 @@ return 0; } -int i2c_write_reals(int nrels, void *buffer, size_t *bufsize, +static int i2c_write_reals(int nrels, void *buffer, size_t *bufsize, long *results, int magnitude) { #define BUFLEN 20 diff -Nru a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c --- a/drivers/ide/arm/icside.c Thu Feb 27 01:44:23 2003 +++ b/drivers/ide/arm/icside.c Thu Feb 27 01:44:23 2003 @@ -731,7 +731,7 @@ static int icside_dma_timeout(ide_drive_t *drive) { - printk(KERN_ERR "%s: DMA timeout occured: ", drive->name); + printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name); if (icside_dma_test_irq(drive)) return 0; diff -Nru a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c --- a/drivers/ide/ide-cd.c Thu Feb 27 01:44:22 2003 +++ b/drivers/ide/ide-cd.c Thu Feb 27 01:44:22 2003 @@ -19,7 +19,7 @@ * ftp://fission.dt.wdc.com/pub/standards/SFF_atapi/spec/SFF8020-r2.6/PS/8020r26.ps * ftp://ftp.avc-pioneer.com/Mtfuji4/Spec/Fuji4r10.pdf * - * Drives that deviate from these standards will be accomodated as much + * Drives that deviate from these standards will be accommodated as much * as possible via compile time or command-line options. Since I only have * a few drives, you generally need to send me patches... * diff -Nru a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c --- a/drivers/ide/ide-dma.c Thu Feb 27 01:44:23 2003 +++ b/drivers/ide/ide-dma.c Thu Feb 27 01:44:23 2003 @@ -196,9 +196,9 @@ * @drive: the drive to build the DMA table for * @rq: the request holding the sg list * - * Perform the PCI mapping magic neccessary to access the source or + * Perform the PCI mapping magic necessary to access the source or * target buffers of a request via PCI DMA. The lower layers of the - * kernel provide the neccessary cache management so that we can + * kernel provide the necessary cache management so that we can * operate in a portable fashion */ @@ -226,9 +226,9 @@ * @drive: the drive to build the DMA table for * @rq: the request holding the sg list * - * Perform the PCI mapping magic neccessary to access the source or + * Perform the PCI mapping magic necessary to access the source or * target buffers of a taskfile request via PCI DMA. The lower layers - * of the kernel provide the neccessary cache management so that we can + * of the kernel provide the necessary cache management so that we can * operate in a portable fashion */ @@ -454,7 +454,7 @@ * An IDE DMA transfer timed out. In the event of an error we ask * the driver to resolve the problem, if a DMA transfer is still * in progress we continue to wait (arguably we need to add a - * secondary 'I dont care what the drive thinks' timeout here) + * secondary 'I don't care what the drive thinks' timeout here) * Finally if we have an interrupt but for some reason got the * timeout first we complete the I/O. This can occur if an * interrupt is lost or due to bugs. diff -Nru a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c --- a/drivers/ide/ide-io.c Thu Feb 27 01:44:27 2003 +++ b/drivers/ide/ide-io.c Thu Feb 27 01:44:27 2003 @@ -379,7 +379,7 @@ * @drive: drive the completion interrupt occurred on * * drive_cmd_intr() is invoked on completion of a special DRIVE_CMD. - * We do any neccessary daya reading and then wait for the drive to + * We do any necessary daya reading and then wait for the drive to * go non busy. At that point we may read the error data and complete * the request */ @@ -652,7 +652,7 @@ * @hwgroup: hardware group to select on * * choose_drive() selects the next drive which will be serviced. - * This is neccessary because the IDE layer can't issue commands + * This is necessary because the IDE layer can't issue commands * to both drives on the same cable, unlike SCSI. */ diff -Nru a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c --- a/drivers/ide/pci/pdc202xx_new.c Thu Feb 27 01:44:27 2003 +++ b/drivers/ide/pci/pdc202xx_new.c Thu Feb 27 01:44:27 2003 @@ -327,7 +327,7 @@ #endif /* PDC202_DEBUG_CABLE */ break; default: - /* If its not one we know we should never + /* If it's not one we know we should never arrive here.. */ BUG(); } diff -Nru a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c --- a/drivers/ide/ppc/mpc8xx.c Thu Feb 27 01:44:30 2003 +++ b/drivers/ide/ppc/mpc8xx.c Thu Feb 27 01:44:30 2003 @@ -331,7 +331,7 @@ (0x80000000 >> ioport_dsc[data_port].irq); #ifdef CONFIG_IDE_8xx_PCCARD - /* Make sure we dont get garbage irq */ + /* Make sure we don't get garbage irq */ ((immap_t *) IMAP_ADDR)->im_pcmcia.pcmc_pscr = 0xFFFF; /* Enable falling edge irq */ diff -Nru a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c --- a/drivers/ide/ppc/pmac.c Thu Feb 27 01:44:18 2003 +++ b/drivers/ide/ppc/pmac.c Thu Feb 27 01:44:18 2003 @@ -1400,7 +1400,7 @@ * to system memory when the disk interrupt occurs. * * The trick here is to increment drive->waiting_for_dma, - * and return as if no interrupt occured. If the counter + * and return as if no interrupt occurred. If the counter * reach a certain timeout value, we then return 1. If * we really got the interrupt, it will happen right away * again. diff -Nru a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c --- a/drivers/ide/setup-pci.c Thu Feb 27 01:44:22 2003 +++ b/drivers/ide/setup-pci.c Thu Feb 27 01:44:22 2003 @@ -470,7 +470,7 @@ * @hwif: Hardware interface we are configuring * * Set up the DMA base for the interface. Enable the master bits as - * neccessary and attempt to bring the device DMA into a ready to use + * necessary and attempt to bring the device DMA into a ready to use * state */ @@ -573,7 +573,7 @@ * @index: ata index to update * * Scan the interfaces attached to this device and do any - * neccessary per port setup. Attach the devices and ask the + * necessary per port setup. Attach the devices and ask the * generic DMA layer to do its work for us. * * Normally called automaticall from do_ide_pci_setup_device, diff -Nru a/drivers/ieee1394/amdtp.c b/drivers/ieee1394/amdtp.c --- a/drivers/ieee1394/amdtp.c Thu Feb 27 01:44:25 2003 +++ b/drivers/ieee1394/amdtp.c Thu Feb 27 01:44:25 2003 @@ -228,7 +228,7 @@ /* The cycle_count and cycle_offset fields are used for the * synchronization timestamps (syt) in the cip header. They * are incremented by at least a cycle every time we put a - * time stamp in a packet. As we dont time stamp all + * time stamp in a packet. As we don't time stamp all * packages, cycle_count isn't updated in every cycle, and * sometimes it's incremented by 2. Thus, we have * cycle_count2, which is simply incremented by one with each @@ -748,7 +748,7 @@ /* This next addition should be modulo 8000 (0x1f40), * but we only use the lower 4 bits of cycle_count, so - * we dont need the modulo. */ + * we don't need the modulo. */ atomic_add(s->cycle_offset.integer / 3072, &s->cycle_count); s->cycle_offset.integer %= 3072; } diff -Nru a/drivers/ieee1394/dv1394-private.h b/drivers/ieee1394/dv1394-private.h --- a/drivers/ieee1394/dv1394-private.h Thu Feb 27 01:44:25 2003 +++ b/drivers/ieee1394/dv1394-private.h Thu Feb 27 01:44:25 2003 @@ -488,7 +488,7 @@ struct frame *frames[DV1394_MAX_FRAMES]; /* n_frames also serves as an indicator that this struct video_card is - intialized and ready to run DMA buffers */ + initialized and ready to run DMA buffers */ int n_frames; diff -Nru a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c --- a/drivers/ieee1394/eth1394.c Thu Feb 27 01:44:25 2003 +++ b/drivers/ieee1394/eth1394.c Thu Feb 27 01:44:25 2003 @@ -663,7 +663,7 @@ * call to schedule our writes. */ /* XXX: Right now we accept that we don't exactly follow RFC. When - * we do, we will send ARP requests via GASP format, and so we wont + * we do, we will send ARP requests via GASP format, and so we won't * need this hack. */ spin_lock_irqsave (&priv->lock, flags); diff -Nru a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c --- a/drivers/ieee1394/ohci1394.c Thu Feb 27 01:44:28 2003 +++ b/drivers/ieee1394/ohci1394.c Thu Feb 27 01:44:28 2003 @@ -827,7 +827,7 @@ return 0; } - /* Decide wether we have an iso, a request, or a response packet */ + /* Decide whether we have an iso, a request, or a response packet */ if (packet->type == hpsb_raw) d = &ohci->at_req_context; else if (packet->tcode == TCODE_ISO_DATA) { @@ -2266,7 +2266,7 @@ if (event & OHCI1394_cycleInconsistent) { /* We subscribe to the cycleInconsistent event only to * clear the corresponding event bit... otherwise, - * isochronous cycleMatch DMA wont work. */ + * isochronous cycleMatch DMA won't work. */ DBGMSG(ohci->id, "OHCI1394_cycleInconsistent"); event &= ~OHCI1394_cycleInconsistent; } @@ -2366,7 +2366,7 @@ if (!(node_id & 0x80000000)) { PRINT(KERN_ERR, ohci->id, "SelfID received, but NodeID invalid " - "(probably new bus reset occured): %08X", + "(probably new bus reset occurred): %08X", node_id); goto selfid_not_valid; } @@ -3530,7 +3530,7 @@ tasklet_init(&tasklet->tasklet, func, data); tasklet->type = type; /* We init the tasklet->link field, so we can list_del() it - * without worrying wether it was added to the list or not. */ + * without worrying whether it was added to the list or not. */ INIT_LIST_HEAD(&tasklet->link); } diff -Nru a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h --- a/drivers/ieee1394/ohci1394.h Thu Feb 27 01:44:18 2003 +++ b/drivers/ieee1394/ohci1394.h Thu Feb 27 01:44:18 2003 @@ -405,12 +405,12 @@ truncated */ #define EVT_OVERRUN 0x5 /* A recv FIFO overflowed on reception of ISO packet */ -#define EVT_DESCRIPTOR_READ 0x6 /* An unrecoverable error occured while host was +#define EVT_DESCRIPTOR_READ 0x6 /* An unrecoverable error occurred while host was reading a descriptor block */ -#define EVT_DATA_READ 0x7 /* An error occured while host controller was +#define EVT_DATA_READ 0x7 /* An error occurred while host controller was attempting to read from host memory in the data stage of descriptor processing */ -#define EVT_DATA_WRITE 0x8 /* An error occured while host controller was +#define EVT_DATA_WRITE 0x8 /* An error occurred while host controller was attempting to write either during the data stage of descriptor processing, or when processing a single 16-bit host memory write */ diff -Nru a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c --- a/drivers/ieee1394/raw1394.c Thu Feb 27 01:44:17 2003 +++ b/drivers/ieee1394/raw1394.c Thu Feb 27 01:44:17 2003 @@ -2440,7 +2440,7 @@ spin_unlock_irq(&host_info_lock); if (fail > 0) { printk(KERN_ERR "raw1394: during addr_list-release " - "error(s) occured \n"); + "error(s) occurred \n"); } while (!done) { diff -Nru a/drivers/isdn/eicon/adapter.h b/drivers/isdn/eicon/adapter.h --- a/drivers/isdn/eicon/adapter.h Thu Feb 27 01:44:30 2003 +++ b/drivers/isdn/eicon/adapter.h Thu Feb 27 01:44:30 2003 @@ -185,7 +185,7 @@ IDI_CALL DivasIdiRequest[]; /* - * intialisation entry point + * initialisation entry point */ int DivasInit(void); diff -Nru a/drivers/isdn/eicon/eicon_idi.c b/drivers/isdn/eicon/eicon_idi.c --- a/drivers/isdn/eicon/eicon_idi.c Thu Feb 27 01:44:16 2003 +++ b/drivers/isdn/eicon/eicon_idi.c Thu Feb 27 01:44:16 2003 @@ -2717,7 +2717,7 @@ int twaitpq = 0; if (ack->RcId != ((chan->e.ReqCh) ? chan->e.B2Id : chan->e.D3Id)) { - /* I dont know why this happens, should not ! */ + /* I don't know why this happens, should not ! */ /* just ignoring this RC */ eicon_log(ccard, 16, "idi_ack: Ch%d: RcId %d not equal to last %d\n", chan->No, ack->RcId, (chan->e.ReqCh) ? chan->e.B2Id : chan->e.D3Id); diff -Nru a/drivers/isdn/eicon/idi.c b/drivers/isdn/eicon/idi.c --- a/drivers/isdn/eicon/idi.c Thu Feb 27 01:44:20 2003 +++ b/drivers/isdn/eicon/idi.c Thu Feb 27 01:44:20 2003 @@ -435,7 +435,7 @@ a->ram_out(a, &ReqOut->ReqId, this->Id); a->ram_out(a, &ReqOut->ReqCh, this->ReqCh); - /* if its a specific request (no ASSIGN) ... */ + /* if it's a specific request (no ASSIGN) ... */ if(this->Id &0x1f) { diff -Nru a/drivers/isdn/hardware/eicon/dadapter.c b/drivers/isdn/hardware/eicon/dadapter.c --- a/drivers/isdn/hardware/eicon/dadapter.c Thu Feb 27 01:44:22 2003 +++ b/drivers/isdn/hardware/eicon/dadapter.c Thu Feb 27 01:44:22 2003 @@ -327,7 +327,7 @@ Adapter array will be written to memory described by 'buffer' If the last adapter seen in the returned adapter array is IDI_DADAPTER or if last adapter in array does have type '0', then - it was enougth space in buffer to accomodate all available + it was enougth space in buffer to accommodate all available adapter descriptors *NOTE 1 (debug interface): The IDI adapter of type 'IDI_DIMAINT' does register as 'request' diff -Nru a/drivers/isdn/hardware/eicon/di.c b/drivers/isdn/hardware/eicon/di.c --- a/drivers/isdn/hardware/eicon/di.c Thu Feb 27 01:44:22 2003 +++ b/drivers/isdn/hardware/eicon/di.c Thu Feb 27 01:44:22 2003 @@ -169,7 +169,7 @@ a->ram_outw(a, &ReqOut->XBuffer.length, length); a->ram_out(a, &ReqOut->ReqId, this->Id); a->ram_out(a, &ReqOut->ReqCh, this->ReqCh); - /* if its a specific request (no ASSIGN) ... */ + /* if it's a specific request (no ASSIGN) ... */ if(this->Id &0x1f) { /* if buffers are left in the list of data buffers do */ /* do chaining (LL_MDATA, N_MDATA) */ @@ -405,7 +405,7 @@ a->ram_outw(a, &RAM->XBuffer.length, length); a->ram_out(a, &RAM->ReqId, this->Id); a->ram_out(a, &RAM->ReqCh, this->ReqCh); - /* if its a specific request (no ASSIGN) ... */ + /* if it's a specific request (no ASSIGN) ... */ if(this->Id &0x1f) { /* if buffers are left in the list of data buffers do */ /* chaining (LL_MDATA, N_MDATA) */ diff -Nru a/drivers/isdn/hardware/eicon/i4l_idi.c b/drivers/isdn/hardware/eicon/i4l_idi.c --- a/drivers/isdn/hardware/eicon/i4l_idi.c Thu Feb 27 01:44:23 2003 +++ b/drivers/isdn/hardware/eicon/i4l_idi.c Thu Feb 27 01:44:23 2003 @@ -2717,7 +2717,7 @@ int twaitpq = 0; if (ack->RcId != ((chan->e.ReqCh) ? chan->e.B2Id : chan->e.D3Id)) { - /* I dont know why this happens, should not ! */ + /* I don't know why this happens, should not ! */ /* just ignoring this RC */ eicon_log(ccard, 16, "idi_ack: Ch%d: RcId %d not equal to last %d\n", chan->No, ack->RcId, (chan->e.ReqCh) ? chan->e.B2Id : chan->e.D3Id); diff -Nru a/drivers/isdn/hardware/eicon/istream.c b/drivers/isdn/hardware/eicon/istream.c --- a/drivers/isdn/hardware/eicon/istream.c Thu Feb 27 01:44:20 2003 +++ b/drivers/isdn/hardware/eicon/istream.c Thu Feb 27 01:44:20 2003 @@ -142,7 +142,7 @@ return 0 if zero packet was received return -1 if stream is empty return -2 if read buffer does not profide sufficient space - to accomodate entire segment + to accommodate entire segment max_length should be at least 68 bytes ------------------------------------------------------------------- */ int diva_istream_read (void* context, diff -Nru a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c --- a/drivers/isdn/hisax/amd7930_fn.c Thu Feb 27 01:44:25 2003 +++ b/drivers/isdn/hisax/amd7930_fn.c Thu Feb 27 01:44:25 2003 @@ -42,7 +42,7 @@ * * Credits: * Programming the driver for Formula-n enter:now ISDN PCI and - * neccessary this driver for the used Amd 7930 D-channel-controller + * necessary this driver for the used Amd 7930 D-channel-controller * was spnsored by Formula-n Europe AG. * Thanks to Karsten Keil and Petr Novak, who gave me support in * Hisax-specific questions. @@ -317,7 +317,7 @@ QuickHex(t, cs->rcvbuf, cs->rcvidx); debugl1(cs, cs->dlog); } - /* moves recieved data in sk-buffer */ + /* moves received data in sk-buffer */ memcpy(skb_put(skb, cs->rcvidx), cs->rcvbuf, cs->rcvidx); skb_queue_tail(&cs->rq, skb); } diff -Nru a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c --- a/drivers/isdn/hisax/asuscom.c Thu Feb 27 01:44:31 2003 +++ b/drivers/isdn/hisax/asuscom.c Thu Feb 27 01:44:31 2003 @@ -283,7 +283,7 @@ printk(KERN_ERR "AsusPnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "AsusPnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c --- a/drivers/isdn/hisax/avm_pci.c Thu Feb 27 01:44:21 2003 +++ b/drivers/isdn/hisax/avm_pci.c Thu Feb 27 01:44:21 2003 @@ -632,7 +632,7 @@ printk(KERN_ERR "FritzPnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pnp_avm, NULL) < 0) { + if (pnp_activate_dev(pnp_avm) < 0) { printk(KERN_ERR "FritzPnP: activate failed\n"); pnp_device_detach(pnp_avm); return 0; diff -Nru a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c --- a/drivers/isdn/hisax/diva.c Thu Feb 27 01:44:30 2003 +++ b/drivers/isdn/hisax/diva.c Thu Feb 27 01:44:30 2003 @@ -600,7 +600,7 @@ printk(KERN_ERR "Diva PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "Diva PnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c --- a/drivers/isdn/hisax/elsa.c Thu Feb 27 01:44:19 2003 +++ b/drivers/isdn/hisax/elsa.c Thu Feb 27 01:44:19 2003 @@ -864,7 +864,7 @@ printk(KERN_ERR "Elsa PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { pnp_device_detach(pd); printk(KERN_ERR "Elsa PnP: activate failed\n"); return 0; diff -Nru a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c --- a/drivers/isdn/hisax/enternow_pci.c Thu Feb 27 01:44:27 2003 +++ b/drivers/isdn/hisax/enternow_pci.c Thu Feb 27 01:44:27 2003 @@ -49,7 +49,7 @@ * * Credits: * Programming the driver for Formula-n enter:now ISDN PCI and - * neccessary the driver for the used Amd 7930 D-channel-controller + * necessary the driver for the used Amd 7930 D-channel-controller * was spnsored by Formula-n Europe AG. * Thanks to Karsten Keil and Petr Novak, who gave me support in * Hisax-specific questions. diff -Nru a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c --- a/drivers/isdn/hisax/hfc_sx.c Thu Feb 27 01:44:18 2003 +++ b/drivers/isdn/hisax/hfc_sx.c Thu Feb 27 01:44:18 2003 @@ -97,7 +97,7 @@ /******************************************/ /* reset the specified fifo to defaults. */ -/* If its a send fifo init needed markers */ +/* If it's a send fifo init needed markers */ /******************************************/ static void reset_fifo(struct IsdnCardState *cs, u8 fifo) @@ -1200,7 +1200,7 @@ printk(KERN_ERR "HFC PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "HFC PnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c --- a/drivers/isdn/hisax/hfcscard.c Thu Feb 27 01:44:30 2003 +++ b/drivers/isdn/hisax/hfcscard.c Thu Feb 27 01:44:30 2003 @@ -193,7 +193,7 @@ printk(KERN_ERR "HFC PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "HFC PnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c --- a/drivers/isdn/hisax/isurf.c Thu Feb 27 01:44:24 2003 +++ b/drivers/isdn/hisax/isurf.c Thu Feb 27 01:44:24 2003 @@ -223,7 +223,7 @@ printk(KERN_ERR "ISurfPnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "ISurfPnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c --- a/drivers/isdn/hisax/ix1_micro.c Thu Feb 27 01:44:30 2003 +++ b/drivers/isdn/hisax/ix1_micro.c Thu Feb 27 01:44:30 2003 @@ -208,7 +208,7 @@ printk(KERN_ERR "ITK PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "ITK PnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c --- a/drivers/isdn/hisax/l3dss1.c Thu Feb 27 01:44:22 2003 +++ b/drivers/isdn/hisax/l3dss1.c Thu Feb 27 01:44:22 2003 @@ -1603,7 +1603,7 @@ * Bearer Capabilities */ p = skb->data; - /* only the first occurence 'll be detected ! */ + /* only the first occurrence 'll be detected ! */ if ((p = findie(p, skb->len, 0x04, 0))) { if ((p[1] < 2) || (p[1] > 11)) err = 1; diff -Nru a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c --- a/drivers/isdn/hisax/l3ni1.c Thu Feb 27 01:44:20 2003 +++ b/drivers/isdn/hisax/l3ni1.c Thu Feb 27 01:44:20 2003 @@ -1456,7 +1456,7 @@ * Bearer Capabilities */ p = skb->data; - /* only the first occurence 'll be detected ! */ + /* only the first occurrence 'll be detected ! */ if ((p = findie(p, skb->len, 0x04, 0))) { if ((p[1] < 2) || (p[1] > 11)) err = 1; diff -Nru a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c --- a/drivers/isdn/hisax/niccy.c Thu Feb 27 01:44:22 2003 +++ b/drivers/isdn/hisax/niccy.c Thu Feb 27 01:44:22 2003 @@ -232,7 +232,7 @@ printk(KERN_ERR "NiccyPnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "NiccyPnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/rawhdlc.c b/drivers/isdn/hisax/rawhdlc.c --- a/drivers/isdn/hisax/rawhdlc.c Thu Feb 27 01:44:19 2003 +++ b/drivers/isdn/hisax/rawhdlc.c Thu Feb 27 01:44:19 2003 @@ -34,7 +34,7 @@ * end-of-frame would occur), so the transmitter performs * "bit-stuffing" - inserting a zero bit after every five one bits, * irregardless of the original bit after the five ones. Byte - * ordering is irrelevent at this point - the data is treated as a + * ordering is irrelevant at this point - the data is treated as a * string of bits, not bytes. Since no more than 5 ones may now occur * in a row, the flag sequence, with its 6 ones, is unique. * diff -Nru a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c --- a/drivers/isdn/hisax/sedlbauer.c Thu Feb 27 01:44:30 2003 +++ b/drivers/isdn/hisax/sedlbauer.c Thu Feb 27 01:44:30 2003 @@ -524,7 +524,7 @@ printk(KERN_ERR "Sedlbauer PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pd, NULL) < 0) { + if (pnp_activate_dev(pd) < 0) { printk(KERN_ERR "Sedlbauer PnP: activate failed\n"); pnp_device_detach(pd); return 0; diff -Nru a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c --- a/drivers/isdn/hisax/teles3.c Thu Feb 27 01:44:31 2003 +++ b/drivers/isdn/hisax/teles3.c Thu Feb 27 01:44:31 2003 @@ -227,7 +227,7 @@ printk(KERN_ERR "Teles PnP: attach failed\n"); return 0; } - if (pnp_activate_dev(pnp_dev, NULL) < 0) { + if (pnp_activate_dev(pnp_dev) < 0) { printk(KERN_ERR "Teles PnP: activate failed\n"); pnp_device_detach(pnp_dev); return 0; diff -Nru a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c --- a/drivers/isdn/hysdn/hycapi.c Thu Feb 27 01:44:18 2003 +++ b/drivers/isdn/hysdn/hycapi.c Thu Feb 27 01:44:18 2003 @@ -521,7 +521,7 @@ Receive a capi-message. All B3_DATA_IND are converted to 64K-extension compatible format. -New nccis are created if neccessary. +New nccis are created if necessary. *******************************************************************/ void @@ -702,7 +702,7 @@ /******************************************************************** hycapi_capi_create(hysdn_card *card) -Attach the card with it's capi-ctrl. +Attach the card with its capi-ctrl. *********************************************************************/ static void hycapi_fill_profile(hysdn_card *card) diff -Nru a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c --- a/drivers/isdn/hysdn/hysdn_boot.c Thu Feb 27 01:44:22 2003 +++ b/drivers/isdn/hysdn/hysdn_boot.c Thu Feb 27 01:44:22 2003 @@ -357,7 +357,7 @@ hysdn_addlog(card, "SysReady Token Data invalid CRC"); return (1); } - len--; /* dont check CRC byte */ + len--; /* don't check CRC byte */ while (len > 0) { if (*cp == SYSR_TOK_END) diff -Nru a/drivers/isdn/i4l/isdn_ppp_ccp.c b/drivers/isdn/i4l/isdn_ppp_ccp.c --- a/drivers/isdn/i4l/isdn_ppp_ccp.c Thu Feb 27 01:44:22 2003 +++ b/drivers/isdn/i4l/isdn_ppp_ccp.c Thu Feb 27 01:44:22 2003 @@ -197,7 +197,7 @@ and increase ids only when an Ack is received for a given id */ id = ccp->reset->lastid++; - /* We always expect an Ack if the decompressor doesnt + /* We always expect an Ack if the decompressor doesn't know better */ rp->expra = 1; rp->dtval = 0; diff -Nru a/drivers/isdn/tpam/tpam_commands.c b/drivers/isdn/tpam/tpam_commands.c --- a/drivers/isdn/tpam/tpam_commands.c Thu Feb 27 01:44:18 2003 +++ b/drivers/isdn/tpam/tpam_commands.c Thu Feb 27 01:44:18 2003 @@ -880,7 +880,7 @@ memcpy(skb_put(result, len), data, len); } - /* In loop mode, resend the data immediatly */ + /* In loop mode, resend the data immediately */ if (card->loopmode) { struct sk_buff *loopskb; diff -Nru a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c --- a/drivers/macintosh/via-pmu.c Thu Feb 27 01:44:30 2003 +++ b/drivers/macintosh/via-pmu.c Thu Feb 27 01:44:30 2003 @@ -1179,7 +1179,7 @@ static inline void wait_for_ack(void) { - /* Sightly increased the delay, I had one occurence of the message + /* Sightly increased the delay, I had one occurrence of the message * reported */ int timeout = 4000; @@ -2066,7 +2066,7 @@ /* Make sure the decrementer won't interrupt us */ asm volatile("mtdec %0" : : "r" (0x7fffffff)); - /* Make sure any pending DEC interrupt occuring while we did + /* Make sure any pending DEC interrupt occurring while we did * the above didn't re-enable the DEC */ mb(); asm volatile("mtdec %0" : : "r" (0x7fffffff)); @@ -2211,7 +2211,7 @@ /* Make sure the decrementer won't interrupt us */ asm volatile("mtdec %0" : : "r" (0x7fffffff)); - /* Make sure any pending DEC interrupt occuring while we did + /* Make sure any pending DEC interrupt occurring while we did * the above didn't re-enable the DEC */ mb(); asm volatile("mtdec %0" : : "r" (0x7fffffff)); @@ -2376,7 +2376,7 @@ /* Make sure the decrementer won't interrupt us */ asm volatile("mtdec %0" : : "r" (0x7fffffff)); - /* Make sure any pending DEC interrupt occuring while we did + /* Make sure any pending DEC interrupt occurring while we did * the above didn't re-enable the DEC */ mb(); asm volatile("mtdec %0" : : "r" (0x7fffffff)); diff -Nru a/drivers/md/dm-table.c b/drivers/md/dm-table.c --- a/drivers/md/dm-table.c Thu Feb 27 01:44:30 2003 +++ b/drivers/md/dm-table.c Thu Feb 27 01:44:30 2003 @@ -499,7 +499,7 @@ } /* - * Decrement a devices use count and remove it if neccessary. + * Decrement a devices use count and remove it if necessary. */ void dm_put_device(struct dm_target *ti, struct dm_dev *dd) { diff -Nru a/drivers/md/md.c b/drivers/md/md.c --- a/drivers/md/md.c Thu Feb 27 01:44:21 2003 +++ b/drivers/md/md.c Thu Feb 27 01:44:21 2003 @@ -119,7 +119,7 @@ .procname = "dev", .maxlen = 0, .mode = 0555, - .proc_handler = raid_dir_table, + .child = raid_dir_table, }, { .ctl_name = 0 } }; @@ -1427,7 +1427,7 @@ /* * 'default chunksize' in the old md code used to * be PAGE_SIZE, baaad. - * we abort here to be on the safe side. We dont + * we abort here to be on the safe side. We don't * want to continue the bad practice. */ printk(BAD_CHUNKSIZE); @@ -1731,7 +1731,7 @@ mddev_unlock(mddev); } /* on success, candidates will be empty, on error - * it wont... + * it won't... */ ITERATE_RDEV_GENERIC(candidates,rdev,tmp) export_rdev(rdev); @@ -2290,7 +2290,7 @@ } err = set_array_info(mddev, &info); if (err) { - printk(KERN_WARNING "md: couldnt set array info. %d\n", err); + printk(KERN_WARNING "md: couldn't set array info. %d\n", err); goto abort_unlock; } } diff -Nru a/drivers/media/dvb/av7110/saa7146.c b/drivers/media/dvb/av7110/saa7146.c --- a/drivers/media/dvb/av7110/saa7146.c Thu Feb 27 01:44:18 2003 +++ b/drivers/media/dvb/av7110/saa7146.c Thu Feb 27 01:44:18 2003 @@ -1396,7 +1396,7 @@ saa7146_write(saa->mem, MC2, (MASK_00 | MASK_16)); } - /* if any error is still present, a fatal error has occured ... */ + /* if any error is still present, a fatal error has occurred ... */ if ( SAA7146_I2C_BBR != (status = i2c_status_check(saa)) ) { hprintk("saa7146: i2c_reset: fatal error, status:0x%08x\n",status); return -EIO; @@ -1444,7 +1444,7 @@ /* check for some other mysterious error; we don't handle this here */ if ( 0 != ( status & 0xff)) { - hprintk("saa7146: i2c_write_out: some error has occured\n"); + hprintk("saa7146: i2c_write_out: some error has occurred\n"); return -EIO; } @@ -1570,7 +1570,7 @@ /* check, if DEBI still active */ u32 psr = saa7146_read(saa->mem, PSR); if (0 != (psr & SPCI_DEBI_S)) { - /* check, if error occured */ + /* check, if error occurred */ /* if ( 0 != (saa7146_read(saa->mem, SSR) & (MASK_23|MASK_22))) { */ if ( 0 != (saa7146_read(saa->mem, SSR) & (MASK_22))) { /* clear error status and indicate error */ diff -Nru a/drivers/media/dvb/av7110/saa7146_core.c b/drivers/media/dvb/av7110/saa7146_core.c --- a/drivers/media/dvb/av7110/saa7146_core.c Thu Feb 27 01:44:27 2003 +++ b/drivers/media/dvb/av7110/saa7146_core.c Thu Feb 27 01:44:27 2003 @@ -222,7 +222,7 @@ * we do not start the whole rps1-engine... */ - /* if address-error occured, don't retry */ + /* if address-error occurred, don't retry */ if (i2c_write_out(a, &a->i2c[i], SAA7146_I2C_TIMEOUT) < 0) { hprintk (KERN_ERR "saa7146_core.o: " "i2c error in address phase\n"); diff -Nru a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c --- a/drivers/media/radio/miropcm20-radio.c Thu Feb 27 01:44:20 2003 +++ b/drivers/media/radio/miropcm20-radio.c Thu Feb 27 01:44:20 2003 @@ -15,7 +15,7 @@ */ /* What ever you think about the ACI, version 0x07 is not very well! - * I cant get frequency, 'tuner status', 'tuner flags' or mute/mono + * I can't get frequency, 'tuner status', 'tuner flags' or mute/mono * conditions... Robert */ @@ -93,7 +93,7 @@ } else { /* stereo */ *flags=VIDEO_TUNER_STEREO_ON; - /* I cant see stereo, when forced to mono */ + /* I can't see stereo, when forced to mono */ dev->stereo=1; } diff -Nru a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c --- a/drivers/media/radio/miropcm20-rds-core.c Thu Feb 27 01:44:30 2003 +++ b/drivers/media/radio/miropcm20-rds-core.c Thu Feb 27 01:44:30 2003 @@ -91,7 +91,7 @@ } } -/* dont use any ..._nowait() function if you are not sure what you do... */ +/* don't use any ..._nowait() function if you are not sure what you do... */ static inline void rds_rawwrite_nowait(unsigned char byte) { diff -Nru a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c --- a/drivers/media/radio/radio-sf16fmi.c Thu Feb 27 01:44:30 2003 +++ b/drivers/media/radio/radio-sf16fmi.c Thu Feb 27 01:44:30 2003 @@ -262,7 +262,7 @@ return -ENODEV; if (pnp_device_attach(dev) < 0) return -EAGAIN; - if (pnp_activate_dev(dev, NULL) < 0) { + if (pnp_activate_dev(dev) < 0) { printk ("radio-sf16fmi: PnP configure failed (out of resources?)\n"); pnp_device_detach(dev); return -ENOMEM; diff -Nru a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c --- a/drivers/media/radio/radio-terratec.c Thu Feb 27 01:44:22 2003 +++ b/drivers/media/radio/radio-terratec.c Thu Feb 27 01:44:22 2003 @@ -129,7 +129,7 @@ long rest; unsigned char buffer[25]; /* we have to bit shift 25 registers */ - freq = freq1/160; /* convert the freq. to a nice to handel value */ + freq = freq1/160; /* convert the freq. to a nice to handle value */ for(i=24;i>-1;i--) buffer[i]=0; diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c --- a/drivers/media/video/saa7110.c Thu Feb 27 01:44:16 2003 +++ b/drivers/media/video/saa7110.c Thu Feb 27 01:44:16 2003 @@ -33,7 +33,7 @@ #define DEBUG(x...) /* remove when no long debugging */ #define SAA7110_MAX_INPUT 9 /* 6 CVBS, 3 SVHS */ -#define SAA7110_MAX_OUTPUT 0 /* its a decoder only */ +#define SAA7110_MAX_OUTPUT 0 /* it's a decoder only */ #define I2C_SAA7110 0x9C /* or 0x9E */ diff -Nru a/drivers/media/video/zr36067.c b/drivers/media/video/zr36067.c --- a/drivers/media/video/zr36067.c Thu Feb 27 01:44:31 2003 +++ b/drivers/media/video/zr36067.c Thu Feb 27 01:44:31 2003 @@ -3629,7 +3629,7 @@ ("%s: ioctl VIDIOCCAPTURE: %d\n", zr->name, v)); - /* If there is nothing to do, return immediatly */ + /* If there is nothing to do, return immediately */ if ((v && zr->v4l_overlay_active) || (!v && !zr->v4l_overlay_active)) @@ -4048,7 +4048,7 @@ zr->params = bp; - /* Make changes of input and norm go into effect immediatly */ + /* Make changes of input and norm go into effect immediately */ /* We switch overlay off and on since a change in the norm needs different VFE settings */ diff -Nru a/drivers/media/video/zr36120_i2c.c b/drivers/media/video/zr36120_i2c.c --- a/drivers/media/video/zr36120_i2c.c Thu Feb 27 01:44:31 2003 +++ b/drivers/media/video/zr36120_i2c.c Thu Feb 27 01:44:31 2003 @@ -86,7 +86,7 @@ if (ztv->tuner_type >= 0) { if (i2c_control_device(&ztv->i2c,I2C_DRIVERID_TUNER,TUNER_SET_TYPE,&ztv->tuner_type)<0) - DEBUG(printk(CARD_INFO "attach_inform; tuner wont be set to type %d\n",CARD,ztv->tuner_type)); + DEBUG(printk(CARD_INFO "attach_inform; tuner won't be set to type %d\n",CARD,ztv->tuner_type)); } break; default: diff -Nru a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c --- a/drivers/message/fusion/mptlan.c Thu Feb 27 01:44:23 2003 +++ b/drivers/message/fusion/mptlan.c Thu Feb 27 01:44:23 2003 @@ -242,7 +242,7 @@ // would Oops because mf has already been set // to NULL. So after return from this func, // mpt_interrupt() will attempt to put (NULL) mf ptr - // item back onto it's adapter FreeQ - Oops!:-( + // item back onto its adapter FreeQ - Oops!:-( // It's Ok, since mpt_lan_send_turbo() *currently* // always returns 0, but..., just in case: diff -Nru a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c --- a/drivers/message/fusion/mptscsih.c Thu Feb 27 01:44:22 2003 +++ b/drivers/message/fusion/mptscsih.c Thu Feb 27 01:44:22 2003 @@ -116,7 +116,7 @@ #define MPT_ICFLAG_ECHO 0x02 /* ReadBuffer Echo buffer format */ #define MPT_ICFLAG_PHYS_DISK 0x04 /* Any SCSI IO but do Phys Disk Format */ #define MPT_ICFLAG_TAGGED_CMD 0x08 /* Do tagged IO */ -#define MPT_ICFLAG_DID_RESET 0x20 /* Bus Reset occured with this command */ +#define MPT_ICFLAG_DID_RESET 0x20 /* Bus Reset occurred with this command */ #define MPT_ICFLAG_RESERVED 0x40 /* Reserved has been issued */ typedef struct _internal_cmd { @@ -4207,7 +4207,7 @@ /* * Need to check ASC here; if it is "special," then * the ASCQ is variable, and indicates failed component number. - * We must treat the ASCQ as a "dont care" while searching the + * We must treat the ASCQ as a "don't care" while searching the * mptscsih_ASCQ_Table[] by masking it off, and then restoring it later * on when we actually need to identify the failed component. */ diff -Nru a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c --- a/drivers/message/i2o/i2o_block.c Thu Feb 27 01:44:26 2003 +++ b/drivers/message/i2o/i2o_block.c Thu Feb 27 01:44:26 2003 @@ -798,7 +798,7 @@ /* * Queue depths probably belong with some kind of - * generic IOP commit control. Certainly its not right + * generic IOP commit control. Certainly it's not right * its global! */ if(atomic_read(&i2ob_queues[dev->unit]->queue_depth) >= dev->depth) @@ -1729,7 +1729,7 @@ * We may get further callbacks for ourself. The i2o_core * code handles this case reasonably sanely. The problem here * is we shouldn't get them .. but a couple of cards feel - * obliged to tell us stuff we dont care about. + * obliged to tell us stuff we don't care about. * * This isnt ideal at all but will do for now. */ diff -Nru a/drivers/message/i2o/i2o_core.c b/drivers/message/i2o/i2o_core.c --- a/drivers/message/i2o/i2o_core.c Thu Feb 27 01:44:25 2003 +++ b/drivers/message/i2o/i2o_core.c Thu Feb 27 01:44:25 2003 @@ -340,7 +340,7 @@ /* * Each I2O controller has a chain of devices on it. - * Each device has a pointer to it's LCT entry to be used + * Each device has a pointer to its LCT entry to be used * for fun purposes. */ @@ -2120,7 +2120,7 @@ * @iop: controller * * This function brings an I2O controller into HOLD state. The adapter - * is reset if neccessary and then the queues and resource table + * is reset if necessary and then the queues and resource table * are read. -1 is returned on a failure, 0 on success. * */ diff -Nru a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c --- a/drivers/mtd/devices/blkmtd.c Thu Feb 27 01:44:17 2003 +++ b/drivers/mtd/devices/blkmtd.c Thu Feb 27 01:44:17 2003 @@ -16,7 +16,7 @@ * thread writes pages out to the device in the background. This * ensures that writes are order even if a page is updated twice. * Also, since pages in the page cache are never marked as dirty, - * we dont have to worry about writepage() being called on some + * we don't have to worry about writepage() being called on some * random page which may not be in the write order. * * Erases are handled like writes, so the callback is called after @@ -33,7 +33,7 @@ * Page cache usage may still be a bit wrong. Check we are doing * everything properly. * - * Somehow allow writes to dirty the page cache so we dont use too + * Somehow allow writes to dirty the page cache so we don't use too * much memory making copies of outgoing pages. Need to handle case * where page x is written to, then page y, then page x again before * any of them have been committed to disk. @@ -217,7 +217,7 @@ DEBUG(3, "blkmtd: readpage: getting kiovec\n"); err = alloc_kiovec(1, &iobuf); if (err) { - printk("blkmtd: cant allocate kiobuf\n"); + printk("blkmtd: can't allocate kiobuf\n"); SetPageError(page); return err; } @@ -226,7 +226,7 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,4) blocks = kmalloc(KIO_MAX_SECTORS * sizeof(*blocks)); if(blocks == NULL) { - printk("blkmtd: cant allocate iobuf blocks\n"); + printk("blkmtd: can't allocate iobuf blocks\n"); free_kiovec(1, &iobuf); SetPageError(page); return -ENOMEM; @@ -306,7 +306,7 @@ daemonize("blkmtdd"); if(alloc_kiovec(1, &iobuf)) { - printk("blkmtd: write_queue_task cant allocate kiobuf\n"); + printk("blkmtd: write_queue_task can't allocate kiobuf\n"); return 0; } @@ -314,7 +314,7 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,4) blocks = kmalloc(KIO_MAX_SECTORS * sizeof(unsigned long)); if(blocks == NULL) { - printk("blkmtd: write_queue_task cant allocate iobuf blocks\n"); + printk("blkmtd: write_queue_task can't allocate iobuf blocks\n"); free_kiovec(1, &iobuf); return 0; } @@ -350,7 +350,7 @@ int max_sectors = KIO_MAX_SECTORS >> (item->rawdevice->sector_bits - 9); /* If we are writing to the last page on the device and it doesn't end - * on a page boundary, subtract the number of sectors that dont exist. + * on a page boundary, subtract the number of sectors that don't exist. */ if(item->rawdevice->partial_last_page && (item->pagenr + item->pagecnt -1) == item->rawdevice->partial_last_page) { @@ -394,7 +394,7 @@ err = brw_kiovec(WRITE, 1, &iobuf, item->rawdevice->binding, blocks, item->rawdevice->sector_size); DEBUG(3, "bklmtd: write_task: done, err = %d\n", err); if(err != (cursectors << item->rawdevice->sector_bits)) { - /* if an error occured - set this to exit the loop */ + /* if an error occurred - set this to exit the loop */ sectorcnt = 0; } else { sectorcnt -= cursectors; @@ -794,7 +794,7 @@ page = grab_cache_page(&rawdevice->as, pagenr); DEBUG(3, "blkmtd: write: got page %d from page cache\n", pagenr); if(!page) { - printk("blkmtd: write: cant grab cache page %d\n", pagenr); + printk("blkmtd: write: can't grab cache page %d\n", pagenr); err = -EIO; goto write_err; } @@ -1090,7 +1090,7 @@ file = filp_open(device, mode, 0); if(IS_ERR(file)) { - printk("blkmtd: error, cant open device %s\n", device); + printk("blkmtd: error, can't open device %s\n", device); DEBUG(2, "blkmtd: filp_open returned %ld\n", PTR_ERR(file)); return 1; } @@ -1144,7 +1144,7 @@ DEBUG(1, "blkmtd: size = %ld\n", (long int)size); if(size == 0) { - printk("blkmtd: cant determine size\n"); + printk("blkmtd: can't determine size\n"); blkdev_put(bdev, BDEV_RAW); return 1; } diff -Nru a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c --- a/drivers/mtd/devices/pmc551.c Thu Feb 27 01:44:27 2003 +++ b/drivers/mtd/devices/pmc551.c Thu Feb 27 01:44:27 2003 @@ -30,7 +30,7 @@ * * Notes: * Due to what I assume is more buggy SROM, the 64M PMC551 I - * have available claims that all 4 of it's DRAM banks have 64M + * have available claims that all 4 of its DRAM banks have 64M * of ram configured (making a grand total of 256M onboard). * This is slightly annoying since the BAR0 size reflects the * aperture size, not the dram size, and the V370PDC supplies no diff -Nru a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c --- a/drivers/mtd/maps/ceiva.c Thu Feb 27 01:44:22 2003 +++ b/drivers/mtd/maps/ceiva.c Thu Feb 27 01:44:22 2003 @@ -94,7 +94,7 @@ * * Please note: * 1. The flash size given should be the largest flash size that can - * be accomodated. + * be accommodated. * * 2. The bus width must defined in clps_setup_flash. * diff -Nru a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c --- a/drivers/mtd/maps/cstm_mips_ixx.c Thu Feb 27 01:44:19 2003 +++ b/drivers/mtd/maps/cstm_mips_ixx.c Thu Feb 27 01:44:19 2003 @@ -5,7 +5,7 @@ * Config with both CFI and JEDEC device support. * * Basically physmap.c with the addition of partitions and - * an array of mapping info to accomodate more than one flash type per board. + * an array of mapping info to accommodate more than one flash type per board. * * Copyright 2000 MontaVista Software Inc. * diff -Nru a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c --- a/drivers/mtd/maps/sa1100-flash.c Thu Feb 27 01:44:20 2003 +++ b/drivers/mtd/maps/sa1100-flash.c Thu Feb 27 01:44:20 2003 @@ -96,7 +96,7 @@ * 1. We no longer support static flash mappings via the machine io_desc * structure. * 2. The flash size given should be the largest flash size that can - * be accomodated. + * be accommodated. * * The MTD layer will detect flash chip aliasing and reduce the size of * the map accordingly. diff -Nru a/drivers/net/3c501.c b/drivers/net/3c501.c --- a/drivers/net/3c501.c Thu Feb 27 01:44:17 2003 +++ b/drivers/net/3c501.c Thu Feb 27 01:44:17 2003 @@ -494,7 +494,7 @@ * @regs: Register data (surplus to our requirements) * * Handle the ether interface interrupts. The 3c501 needs a lot more - * hand holding than most cards. In paticular we get a transmit interrupt + * hand holding than most cards. In particular we get a transmit interrupt * with a collision error because the board firmware isnt capable of rewinding * its own transmit buffer pointers. It can however count to 16 for us. * @@ -684,7 +684,7 @@ * @dev: Device to pull the packets from * * We have a good packet. Well, not really "good", just mostly not broken. - * We must check everything to see if it is good. In paticular we occasionally + * We must check everything to see if it is good. In particular we occasionally * get wild packet sizes from the card. If the packet seems sane we PIO it * off the card and queue it for the protocol layers. */ diff -Nru a/drivers/net/3c503.c b/drivers/net/3c503.c --- a/drivers/net/3c503.c Thu Feb 27 01:44:26 2003 +++ b/drivers/net/3c503.c Thu Feb 27 01:44:26 2003 @@ -693,7 +693,7 @@ MODULE_PARM(xcvr, "1-" __MODULE_STRING(MAX_EL2_CARDS) "i"); MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); -MODULE_PARM_DESC(xcvr, "tranceiver(s) (0=internal, 1=external)"); +MODULE_PARM_DESC(xcvr, "transceiver(s) (0=internal, 1=external)"); MODULE_DESCRIPTION("3Com ISA EtherLink II, II/16 (3c503, 3c503/16) driver"); MODULE_LICENSE("GPL"); diff -Nru a/drivers/net/3c509.c b/drivers/net/3c509.c --- a/drivers/net/3c509.c Thu Feb 27 01:44:17 2003 +++ b/drivers/net/3c509.c Thu Feb 27 01:44:17 2003 @@ -385,7 +385,7 @@ idev))) { if (pnp_device_attach(idev) < 0) continue; - if (pnp_activate_dev(idev, NULL) < 0) { + if (pnp_activate_dev(idev) < 0) { __again: pnp_device_detach(idev); continue; @@ -1139,7 +1139,7 @@ int ioaddr = dev->base_addr; EL3WINDOW(0); - /* obtain current tranceiver via WN4_MEDIA? */ + /* obtain current transceiver via WN4_MEDIA? */ tmp = inw(ioaddr + WN0_ADDR_CONF); ecmd->transceiver = XCVR_INTERNAL; switch (tmp >> 14) { @@ -1548,7 +1548,7 @@ MODULE_PARM(max_interrupt_work, "i"); MODULE_PARM_DESC(debug, "debug level (0-6)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); -MODULE_PARM_DESC(xcvr,"tranceiver(s) (0=internal, 1=external)"); +MODULE_PARM_DESC(xcvr,"transceiver(s) (0=internal, 1=external)"); MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt"); #ifdef __ISAPNP__ MODULE_PARM(nopnp, "i"); diff -Nru a/drivers/net/3c515.c b/drivers/net/3c515.c --- a/drivers/net/3c515.c Thu Feb 27 01:44:19 2003 +++ b/drivers/net/3c515.c Thu Feb 27 01:44:19 2003 @@ -469,7 +469,7 @@ if (pnp_device_attach(idev) < 0) continue; - if (pnp_activate_dev(idev, NULL) < 0) { + if (pnp_activate_dev(idev) < 0) { printk("pnp activate failed (out of resources?)\n"); pnp_device_detach(idev); return -ENOMEM; diff -Nru a/drivers/net/3c527.c b/drivers/net/3c527.c --- a/drivers/net/3c527.c Thu Feb 27 01:44:24 2003 +++ b/drivers/net/3c527.c Thu Feb 27 01:44:24 2003 @@ -227,7 +227,7 @@ * Because MCA bus is a real bus and we can scan for cards we could do a * single scan for all boards here. Right now we use the passed in device * structure and scan for only one board. This needs fixing for modules - * in paticular. + * in particular. */ int __init mc32_probe(struct net_device *dev) @@ -1168,7 +1168,7 @@ * the stack or, if the packet is near MTU sized, we allocate * another buffer and flip the old one up the stack. * - * We must succeed in keeping a buffer on the ring. If neccessary we + * We must succeed in keeping a buffer on the ring. If necessary we * will toss a received packet rather than lose a ring entry. Once * the first uncompleted descriptor is found, we move the * End-Of-List bit to include the buffers just processed. diff -Nru a/drivers/net/8390.c b/drivers/net/8390.c --- a/drivers/net/8390.c Thu Feb 27 01:44:18 2003 +++ b/drivers/net/8390.c Thu Feb 27 01:44:18 2003 @@ -277,7 +277,7 @@ /* Mask interrupts from the ethercard. SMP: We have to grab the lock here otherwise the IRQ handler on another CPU can flip window and race the IRQ mask set. We end - up trashing the mcast filter not disabling irqs if we dont lock */ + up trashing the mcast filter not disabling irqs if we don't lock */ spin_lock_irqsave(&ei_local->page_lock, flags); outb_p(0x00, e8390_base + EN0_IMR); @@ -417,7 +417,7 @@ * Handle the ether interface interrupts. We pull packets from * the 8390 via the card specific functions and fire them at the networking * stack. We also handle transmit completions and wake the transmit path if - * neccessary. We also update the counters and do other housekeeping as + * necessary. We also update the counters and do other housekeeping as * needed. */ diff -Nru a/drivers/net/acenic.c b/drivers/net/acenic.c --- a/drivers/net/acenic.c Thu Feb 27 01:44:22 2003 +++ b/drivers/net/acenic.c Thu Feb 27 01:44:22 2003 @@ -1378,7 +1378,7 @@ * On this platform, we know what the best dma settings * are. We use 64-byte maximum bursts, because if we * burst larger than the cache line size (or even cross - * a 64byte boundry in a single burst) the UltraSparc + * a 64byte boundary in a single burst) the UltraSparc * PCI controller will disconnect at 64-byte multiples. * * Read-multiple will be properly enabled above, and when diff -Nru a/drivers/net/atp.c b/drivers/net/atp.c --- a/drivers/net/atp.c Thu Feb 27 01:44:31 2003 +++ b/drivers/net/atp.c Thu Feb 27 01:44:31 2003 @@ -162,7 +162,7 @@ MODULE_PARM_DESC(debug, "ATP debug level (0-7)"); MODULE_PARM_DESC(io, "ATP I/O base address(es)"); MODULE_PARM_DESC(irq, "ATP IRQ number(s)"); -MODULE_PARM_DESC(xcvr, "ATP tranceiver(s) (0=internal, 1=external)"); +MODULE_PARM_DESC(xcvr, "ATP transceiver(s) (0=internal, 1=external)"); /* The number of low I/O ports used by the ethercard. */ #define ETHERCARD_TOTAL_SIZE 3 diff -Nru a/drivers/net/b44.h b/drivers/net/b44.h --- a/drivers/net/b44.h Thu Feb 27 01:44:25 2003 +++ b/drivers/net/b44.h Thu Feb 27 01:44:25 2003 @@ -424,7 +424,7 @@ }; /* There are only 12 bits in the DMA engine for descriptor offsetting - * so the table must be aligned on a boundry of this. + * so the table must be aligned on a boundary of this. */ #define DMA_TABLE_BYTES 4096 diff -Nru a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c --- a/drivers/net/cs89x0.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/cs89x0.c Thu Feb 27 01:44:27 2003 @@ -1112,7 +1112,7 @@ int i; int ret; -#ifndef CONFIG_SH_HICOSH4 /* uses irq#1, so this wont work */ +#ifndef CONFIG_SH_HICOSH4 /* uses irq#1, so this won't work */ if (dev->irq < 2) { /* Allow interrupts to be generated by the chip */ /* Cirrus' release had this: */ diff -Nru a/drivers/net/declance.c b/drivers/net/declance.c --- a/drivers/net/declance.c Thu Feb 27 01:44:24 2003 +++ b/drivers/net/declance.c Thu Feb 27 01:44:24 2003 @@ -887,7 +887,7 @@ cp_to_buf((char *) lp->tx_buf_ptr_cpu[entry], skb->data, skblen); /* Clear the slack of the packet, do I need this? */ - /* For a firewall its a good idea - AC */ + /* For a firewall it's a good idea - AC */ /* if (len != skblen) memset ((char *) &ib->tx_buf [entry][skblen], 0, (len - skblen) << 1); diff -Nru a/drivers/net/dgrs.c b/drivers/net/dgrs.c --- a/drivers/net/dgrs.c Thu Feb 27 01:44:17 2003 +++ b/drivers/net/dgrs.c Thu Feb 27 01:44:17 2003 @@ -274,7 +274,7 @@ ulong x; /* - * If Space.c says not to use DMA, or if its not a PLX based + * If Space.c says not to use DMA, or if it's not a PLX based * PCI board, or if the expansion ROM space is not PCI * configured, then return false. */ @@ -331,10 +331,10 @@ * Initiate DMA using PLX part on PCI board. Spin the * processor until completed. All addresses are physical! * - * If pciaddr is NULL, then its a chaining DMA, and lcladdr is + * If pciaddr is NULL, then it's a chaining DMA, and lcladdr is * the address of the first DMA descriptor in the chain. * - * If pciaddr is not NULL, then its a single DMA. + * If pciaddr is not NULL, then it's a single DMA. * * In either case, "lcladdr" must have been fixed up to make * sure the MSB isn't set using the S2DMA macro before passing @@ -511,7 +511,7 @@ if (priv0->use_dma && priv0->dmadesc_h && len > 64) { /* - * If we can use DMA and its a long frame, copy it using + * If we can use DMA and it's a long frame, copy it using * DMA chaining. */ DMACHAIN *ddp_h; /* Host virtual DMA desc. pointer */ @@ -583,7 +583,7 @@ else if (priv0->use_dma) { /* - * If we can use DMA and its a shorter frame, copy it + * If we can use DMA and it's a shorter frame, copy it * using single DMA transfers. */ uchar *phys_p; diff -Nru a/drivers/net/e100/e100_config.c b/drivers/net/e100/e100_config.c --- a/drivers/net/e100/e100_config.c Thu Feb 27 01:44:21 2003 +++ b/drivers/net/e100/e100_config.c Thu Feb 27 01:44:21 2003 @@ -149,7 +149,7 @@ * 32 from the RFD base address, instead of at offset 16. */ bdp->config[7] |= CB_CFIG_EXTENDED_RFD; - /* put the chip into D102 receive mode. This is neccessary + /* put the chip into D102 receive mode. This is necessary * for any parsing and offloading features. */ bdp->config[22] = CB_CFIG_RECEIVE_GAMLA_MODE; diff -Nru a/drivers/net/e100/e100_eeprom.c b/drivers/net/e100/e100_eeprom.c --- a/drivers/net/e100/e100_eeprom.c Thu Feb 27 01:44:22 2003 +++ b/drivers/net/e100/e100_eeprom.c Thu Feb 27 01:44:22 2003 @@ -138,7 +138,7 @@ // is then passed to the read/write functions. // // Returns: -// Size of the eeprom, or zero if an error occured +// Size of the eeprom, or zero if an error occurred //---------------------------------------------------------------------------------------- u16 e100_eeprom_size(struct e100_private *adapter) diff -Nru a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c --- a/drivers/net/e100/e100_main.c Thu Feb 27 01:44:23 2003 +++ b/drivers/net/e100/e100_main.c Thu Feb 27 01:44:23 2003 @@ -1949,7 +1949,7 @@ /* to allow manipulation with current skb we need to unlink it */ list_del(&(rx_struct->list_elem)); - /* do not free & unmap badly recieved packet. + /* do not free & unmap badly received packet. * move it to the end of skb list for reuse */ if (!(rfd_status & RFD_STATUS_OK)) { e100_add_skb_to_end(bdp, rx_struct); @@ -2236,7 +2236,7 @@ spin_lock_irqsave(&(bdp->bd_lock), lock_flag); switch (bdp->next_cu_cmd) { case RESUME_NO_WAIT: - /*last cu command was a CU_RESMUE if this is a 558 or newer we dont need to + /*last cu command was a CU_RESMUE if this is a 558 or newer we don't need to * wait for command word to clear, we reach here only if we are bachlor */ e100_exec_cmd(bdp, SCB_CUC_RESUME); diff -Nru a/drivers/net/e2100.c b/drivers/net/e2100.c --- a/drivers/net/e2100.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/e2100.c Thu Feb 27 01:44:30 2003 @@ -389,7 +389,7 @@ MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(irq, "IRQ number(s)"); MODULE_PARM_DESC(mem, " memory base address(es)"); -MODULE_PARM_DESC(xcvr, "tranceiver(s) (0=internal, 1=external)"); +MODULE_PARM_DESC(xcvr, "transceiver(s) (0=internal, 1=external)"); MODULE_DESCRIPTION("Cabletron E2100 ISA ethernet driver"); MODULE_LICENSE("GPL"); diff -Nru a/drivers/net/eepro100.c b/drivers/net/eepro100.c --- a/drivers/net/eepro100.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/eepro100.c Thu Feb 27 01:44:25 2003 @@ -148,7 +148,7 @@ MODULE_PARM(max_interrupt_work, "i"); MODULE_PARM(multicast_filter_limit, "i"); MODULE_PARM_DESC(debug, "debug level (0-6)"); -MODULE_PARM_DESC(options, "Bits 0-3: tranceiver type, bit 4: full duplex, bit 5: 100Mbps"); +MODULE_PARM_DESC(options, "Bits 0-3: transceiver type, bit 4: full duplex, bit 5: 100Mbps"); MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)"); MODULE_PARM_DESC(congenb, "Enable congestion control (1)"); MODULE_PARM_DESC(txfifo, "Tx FIFO threshold in 4 byte units, (0-15)"); diff -Nru a/drivers/net/eth16i.c b/drivers/net/eth16i.c --- a/drivers/net/eth16i.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/eth16i.c Thu Feb 27 01:44:27 2003 @@ -1231,7 +1231,7 @@ /* Turn off all interrupts from adapter */ outw(ETH16I_INTR_OFF, ioaddr + TX_INTR_REG); - /* eth16i_tx wont be called */ + /* eth16i_tx won't be called */ spin_lock(&lp->lock); status = inw(ioaddr + TX_STATUS_REG); /* Get the status */ diff -Nru a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c --- a/drivers/net/fc/iph5526.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/fc/iph5526.c Thu Feb 27 01:44:20 2003 @@ -499,7 +499,7 @@ fi->q.ptr_tachyon_header[i] = fi->q.ptr_tachyon_header_base + 16*i; /* Allocate memory for indices. - * Indices should be aligned on 32 byte boundries. + * Indices should be aligned on 32 byte boundaries. */ fi->q.host_ocq_cons_indx = kmalloc(2*32, GFP_KERNEL); if (fi->q.host_ocq_cons_indx == NULL){ @@ -748,7 +748,7 @@ else if (current_IMQ_index < fi->q.imq_cons_indx) no_of_entries = IMQ_LENGTH - (fi->q.imq_cons_indx - current_IMQ_index); - /* We dont want to look at the same IMQ entry again. + /* We don't want to look at the same IMQ entry again. */ temp_imq_cons_indx = fi->q.imq_cons_indx + 1; if (no_of_entries != 0) @@ -2263,7 +2263,7 @@ u_int type = TYPE_ELS | SEQUENCE_INITIATIVE | FIRST_SEQUENCE; u_int my_mtu = fi->g.my_mtu; ENTER("tx_logi"); - /* We dont want interrupted for our own logi. + /* We don't want interrupted for our own logi. * It screws up the port discovery process. */ if (d_id == fi->g.my_id) @@ -2567,7 +2567,7 @@ } /* Perform Port Discovery after timer expires. * We are giving time for the ADISCed nodes to respond - * so that we dont have to perform PLOGI to those whose + * so that we don't have to perform PLOGI to those whose * login are _still_ valid. */ fi->explore_timer.function = port_discovery_timer; @@ -3527,7 +3527,7 @@ /* There might be some new nodes to be * discovered. But, some of the earlier * requests as a result of the RSCN might be - * in progress. We dont want to duplicate that + * in progress. We don't want to duplicate that * effort. So letz call SCR after a lag. */ fi->explore_timer.function = scr_timer; diff -Nru a/drivers/net/fc/tach_structs.h b/drivers/net/fc/tach_structs.h --- a/drivers/net/fc/tach_structs.h Thu Feb 27 01:44:26 2003 +++ b/drivers/net/fc/tach_structs.h Thu Feb 27 01:44:26 2003 @@ -248,7 +248,7 @@ volatile u_char n_port_try; volatile u_char nport_timer_set; volatile u_char lport_timer_set; - /* Hmmm... We dont want to Initialize while closing */ + /* Hmmm... We don't want to Initialize while closing */ u_char dont_init; u_int my_node_name_high; u_int my_node_name_low; diff -Nru a/drivers/net/fec.c b/drivers/net/fec.c --- a/drivers/net/fec.c Thu Feb 27 01:44:18 2003 +++ b/drivers/net/fec.c Thu Feb 27 01:44:18 2003 @@ -828,7 +828,7 @@ /* * I had some nice ideas of running the MDIO faster... * The 971 should support 8MHz and I tried it, but things acted really - * wierd, so 2.5 MHz ought to be enough for anyone... + * weird, so 2.5 MHz ought to be enough for anyone... */ static void mii_parse_lxt971_sr2(uint mii_reg, struct net_device *dev) diff -Nru a/drivers/net/hamachi.c b/drivers/net/hamachi.c --- a/drivers/net/hamachi.c Thu Feb 27 01:44:31 2003 +++ b/drivers/net/hamachi.c Thu Feb 27 01:44:31 2003 @@ -316,7 +316,7 @@ the new buffer or the function returns non-zero which should case the scheduler to reschedule the buffer later. -01/15/1999 EPK Some adjustments were made to the chip intialization. +01/15/1999 EPK Some adjustments were made to the chip initialization. End-to-end flow control should now be fully active and the interrupt algorithm vars have been changed. These could probably use further tuning. diff -Nru a/drivers/net/hp100.c b/drivers/net/hp100.c --- a/drivers/net/hp100.c Thu Feb 27 01:44:22 2003 +++ b/drivers/net/hp100.c Thu Feb 27 01:44:22 2003 @@ -2811,7 +2811,7 @@ printk("hp100: %s: Problem logging into the HUB.\n", dev->name); if (lp->chip == HP100_CHIPID_LASSEN) { /* Check allowed Register to find out why there is a problem. */ - val = hp100_inw(TRAIN_ALLOW); /* wont work on non-ETR card */ + val = hp100_inw(TRAIN_ALLOW); /* won't work on non-ETR card */ #ifdef HP100_DEBUG_TRAINING printk("hp100: %s: MAC Configuration requested: 0x%04x, HUB allowed: 0x%04x\n", dev->name, hp100_inw(TRAIN_REQUEST), val); #endif @@ -2868,7 +2868,7 @@ hp100_andb(~HP100_PCI_RESET, PCICTRL2); hp100_orb(HP100_PCI_RESET, PCICTRL2); /* Wait for min. 300 ns */ - /* we cant use jiffies here, because it may be */ + /* we can't use jiffies here, because it may be */ /* that we have disabled the timer... */ udelay(400); hp100_andb(~HP100_PCI_RESET, PCICTRL2); diff -Nru a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c --- a/drivers/net/irda/actisys-sir.c Thu Feb 27 01:44:24 2003 +++ b/drivers/net/irda/actisys-sir.c Thu Feb 27 01:44:24 2003 @@ -207,7 +207,7 @@ * o second put the dongle in a know state * * The dongle is powered of the RTS and DTR lines. In the dongle, there - * is a big capacitor to accomodate the current spikes. This capacitor + * is a big capacitor to accommodate the current spikes. This capacitor * takes a least 50 ms to be charged. In theory, the Bios set those lines * up, so by the time we arrive here we should be set. It doesn't hurt * to be on the conservative side, so we will wait... diff -Nru a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c --- a/drivers/net/irda/actisys.c Thu Feb 27 01:44:31 2003 +++ b/drivers/net/irda/actisys.c Thu Feb 27 01:44:31 2003 @@ -217,7 +217,7 @@ * o second put the dongle in a know state * * The dongle is powered of the RTS and DTR lines. In the dongle, there - * is a big capacitor to accomodate the current spikes. This capacitor + * is a big capacitor to accommodate the current spikes. This capacitor * takes a least 50 ms to be charged. In theory, the Bios set those lines * up, so by the time we arrive here we should be set. It doesn't hurt * to be on the conservative side, so we will wait... diff -Nru a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c --- a/drivers/net/irda/irda-usb.c Thu Feb 27 01:44:23 2003 +++ b/drivers/net/irda/irda-usb.c Thu Feb 27 01:44:23 2003 @@ -120,7 +120,7 @@ /************************ TRANSMIT ROUTINES ************************/ /* * Receive packets from the IrDA stack and send them on the USB pipe. - * Handle speed change, timeout and lot's of uglyness... + * Handle speed change, timeout and lot's of ugliness... */ /*------------------------------------------------------------------*/ diff -Nru a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c --- a/drivers/net/irda/irtty-sir.c Thu Feb 27 01:44:16 2003 +++ b/drivers/net/irda/irtty-sir.c Thu Feb 27 01:44:16 2003 @@ -532,7 +532,7 @@ tty->driver.flush_buffer(tty); /* from old irtty - but what is it good for? - * we _are_ the ldisc and we _dont_ implement flush_buffer! + * we _are_ the ldisc and we _don't_ implement flush_buffer! * * if (tty->ldisc.flush_buffer) * tty->ldisc.flush_buffer(tty); diff -Nru a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c --- a/drivers/net/irda/sir_dev.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/irda/sir_dev.c Thu Feb 27 01:44:25 2003 @@ -569,7 +569,7 @@ /* instead of adding tests to protect against drv->do_write==NULL * at several places we refuse to create a sir_dev instance for - * drivers which dont implement do_write. + * drivers which don't implement do_write. */ if (!drv || !drv->do_write) return NULL; diff -Nru a/drivers/net/irda/sir_kthread.c b/drivers/net/irda/sir_kthread.c --- a/drivers/net/irda/sir_kthread.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/irda/sir_kthread.c Thu Feb 27 01:44:27 2003 @@ -151,7 +151,7 @@ while (irda_rq_queue.thread != NULL) { - set_task_state(current, TASK_UNINTERRUPTIBLE); + set_task_state(current, TASK_INTERRUPTIBLE); add_wait_queue(&irda_rq_queue.kick, &wait); if (list_empty(&irda_rq_queue.request_list)) schedule(); diff -Nru a/drivers/net/ne.c b/drivers/net/ne.c --- a/drivers/net/ne.c Thu Feb 27 01:44:22 2003 +++ b/drivers/net/ne.c Thu Feb 27 01:44:22 2003 @@ -205,7 +205,7 @@ /* Avoid already found cards from previous calls */ if (pnp_device_attach(idev) < 0) continue; - if (pnp_activate_dev(idev, NULL) < 0) { + if (pnp_activate_dev(idev) < 0) { pnp_device_detach(idev); continue; } diff -Nru a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig --- a/drivers/net/pcmcia/Kconfig Thu Feb 27 01:44:27 2003 +++ b/drivers/net/pcmcia/Kconfig Thu Feb 27 01:44:27 2003 @@ -153,19 +153,5 @@ The module will be called ibmtr_cs. If you want to compile it as a module, say M here and read . -config AIRONET4500_CS - tristate "Aironet 4500/4800 PCMCIA support" - depends on NET_PCMCIA_RADIO && AIRONET4500 && PCMCIA - help - Say Y here if you have a PCMCIA Aironet 4500/4800 card which you - want to use with the standard PCMCIA cardservices provided by the - pcmcia-cs package. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called aironet4500_cs. If you want to - compile it as a module, say M here and read - . - endmenu diff -Nru a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile --- a/drivers/net/pcmcia/Makefile Thu Feb 27 01:44:16 2003 +++ b/drivers/net/pcmcia/Makefile Thu Feb 27 01:44:16 2003 @@ -13,7 +13,4 @@ obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o -# 16-bit wireless client drivers -obj-$(CONFIG_AIRONET4500_CS) += aironet4500_cs.o - obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o diff -Nru a/drivers/net/pcmcia/aironet4500_cs.c b/drivers/net/pcmcia/aironet4500_cs.c --- a/drivers/net/pcmcia/aironet4500_cs.c Thu Feb 27 01:44:17 2003 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,706 +0,0 @@ -/* - * Aironet 4500 Pcmcia driver - * - * Elmer Joandi, Januar 1999 - * Copyright Elmer Joandi, all rights restricted - * - * - * Revision 0.1 ,started 30.12.1998 - * - * - */ - -#define DRV_NAME "aironet4500_cs" -#define DRV_VERSION "0.1" - -static const char *awc_version = -DRV_NAME ".c v" DRV_VERSION " 1/1/99 Elmer Joandi, elmer@ylenurme.ee.\n"; - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "../aironet4500.h" - -static u_int irq_mask = 0x5eF8; -static int awc_ports[] = {0x140,0x100,0xc0, 0x80 }; -#if LINUX_VERSION_CODE > 0x20100 -MODULE_PARM(irq_mask, "i"); - -#endif - - -#define RUN_AT(x) (jiffies+(x)) - -#ifdef PCMCIA_DEBUG -static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); -#define PC_DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) -static char *version = -"aironet4500_cs.c v0.1 1/1/99 Elmer Joandi, elmer@ylenurme.ee.\n"; -#else -#define PC_DEBUG(n, args...) -#endif - -/* Index of functions. */ - -static dev_info_t dev_info = "aironet4500_cs"; - -static dev_link_t *awc_attach(void); -static void awc_detach(dev_link_t *); -static void awc_release(u_long arg); -static int awc_event(event_t event, int priority, - event_callback_args_t *args); - -static dev_link_t *dev_list; - -static void cs_error(client_handle_t handle, int func, int ret) -{ -#if CS_RELEASE_CODE < 0x2911 - CardServices(ReportError, dev_info, (void *)func, (void *)ret); -#else - error_info_t err = { func, ret }; - CardServices(ReportError, handle, &err); -#endif -} - -#define CFG_CHECK(fn, args...) if (CardServices(fn, args) != 0) goto next_entry - -static void flush_stale_links(void) -{ - dev_link_t *link, *next; - for (link = dev_list; link; link = next) { - next = link->next; - if (link->state & DEV_STALE_LINK) - awc_detach(link); - } -} - - -/* - We never need to do anything when a awc device is "initialized" - by the net software, because we only register already-found cards. -*/ - -static int awc_pcmcia_init(struct net_device *dev) -{ - return awc_init(dev); - -} - -static int awc_pcmcia_open(struct net_device *dev) -{ - dev_link_t *link; - int status; - - for (link = dev_list; link; link = link->next) - if (link->priv == dev) break; - if (!DEV_OK(link)) - return -ENODEV; - - status = awc_open(dev); - - if (!status ) - link->open++; - - return status; -} - -static int awc_pcmcia_close(struct net_device *dev) -{ -// int ioaddr = dev->base_addr; - dev_link_t *link; - int ret; - - for (link = dev_list; link; link = link->next) - if (link->priv == dev) break; - if (link == NULL) - return -ENODEV; - - PC_DEBUG(2, "%s: closing device.\n", dev->name); - - link->open--; - ret = awc_close(dev); - - if (link->state & DEV_STALE_CONFIG) { - link->release.expires = RUN_AT( HZ/20 ); - link->state |= DEV_RELEASE_PENDING; - add_timer(&link->release); - } - return ret; -} - -static int netdev_ethtool_ioctl (struct net_device *dev, void *useraddr) -{ - u32 ethcmd; - - /* dev_ioctl() in ../../net/core/dev.c has already checked - capable(CAP_NET_ADMIN), so don't bother with that here. */ - - if (get_user(ethcmd, (u32 *)useraddr)) - return -EFAULT; - - switch (ethcmd) { - - case ETHTOOL_GDRVINFO: { - struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; - strcpy (info.driver, DRV_NAME); - strcpy (info.version, DRV_VERSION); - sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr); - if (copy_to_user (useraddr, &info, sizeof (info))) - return -EFAULT; - return 0; - } - -#ifdef PCMCIA_DEBUG - /* get message-level */ - case ETHTOOL_GMSGLVL: { - struct ethtool_value edata = {ETHTOOL_GMSGLVL}; - edata.data = pc_debug; - if (copy_to_user(useraddr, &edata, sizeof(edata))) - return -EFAULT; - return 0; - } - /* set message-level */ - case ETHTOOL_SMSGLVL: { - struct ethtool_value edata; - if (copy_from_user(&edata, useraddr, sizeof(edata))) - return -EFAULT; - pc_debug = edata.data; - return 0; - } -#endif - - default: - break; - } - - return -EOPNOTSUPP; -} - -static int awc_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) -{ - switch (cmd) { - case SIOCETHTOOL: - return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data); - - default: - return -EOPNOTSUPP; - } - return 0; -} - -/* - awc_attach() creates an "instance" of the driver, allocating - local data structures for one device. The device is registered - with Card Services. -*/ - -static dev_link_t *awc_attach(void) -{ - client_reg_t client_reg; - dev_link_t *link = NULL; - struct net_device *dev = NULL; - int ret; - - PC_DEBUG(0, "awc_attach()\n"); - flush_stale_links(); - - /* Create the PC card device object. */ - link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL); - if (!link) - return NULL; - memset(link, 0, sizeof(struct dev_link_t)); - - link->dev = kmalloc(sizeof(struct dev_node_t), GFP_KERNEL); - if (!link->dev) { - kfree(link); - return NULL; - } - - memset(link->dev, 0, sizeof(struct dev_node_t)); - - init_timer(&link->release); - link->release.function = &awc_release; - link->release.data = (u_long)link; -// link->io.NumPorts1 = 32; - link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; -// link->io.IOAddrLines = 5; - link->irq.Attributes = IRQ_HANDLE_PRESENT ; // |IRQ_TYPE_EXCLUSIVE ; - link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; - link->irq.IRQInfo2 = irq_mask; - link->irq.Handler = &awc_interrupt; - link->conf.Attributes = CONF_ENABLE_IRQ; - link->conf.Vcc = 50; - link->conf.IntType = INT_MEMORY_AND_IO; - link->conf.ConfigIndex = 1; - link->conf.Present = PRESENT_OPTION; - - /* Create the network device object. */ - - dev = kmalloc(sizeof(struct net_device ), GFP_KERNEL); -// dev = init_etherdev(0, sizeof(struct awc_private) ); - if (!dev ) { - printk(KERN_CRIT "out of mem on dev alloc \n"); - kfree(link->dev); - kfree(link); - return NULL; - }; - memset(dev,0,sizeof(struct net_device)); - dev->priv = kmalloc(sizeof(struct awc_private), GFP_KERNEL); - if (!dev->priv ) {printk(KERN_CRIT "out of mem on dev priv alloc \n"); return NULL;}; - memset(dev->priv,0,sizeof(struct awc_private)); - -// link->dev->minor = dev->minor; -// link->dev->major = dev->major; - - /* The 4500-specific entries in the device structure. */ - -// dev->tx_queue_len = tx_queue_len; - - dev->hard_start_xmit = &awc_start_xmit; -// dev->set_config = &awc_config_misiganes,aga mitte awc_config; - dev->get_stats = &awc_get_stats; -// dev->set_multicast_list = &awc_set_multicast_list; - dev->do_ioctl = &awc_ioctl; - - strcpy(dev->name, ((struct awc_private *)dev->priv)->node.dev_name); - - ether_setup(dev); - - dev->init = &awc_pcmcia_init; - dev->open = &awc_pcmcia_open; - dev->stop = &awc_pcmcia_close; - - link->priv = dev; -#if CS_RELEASE_CODE > 0x2911 - link->irq.Instance = dev; -#endif - - /* Register with Card Services */ - link->next = dev_list; - dev_list = link; - - - client_reg.dev_info = &dev_info; - client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &awc_event; - client_reg.Version = 0x0210; - client_reg.event_callback_args.client_data = link; - ret = CardServices(RegisterClient, &link->handle, &client_reg); - if (ret != 0) { - cs_error(link->handle, RegisterClient, ret); - awc_detach(link); - return NULL; - } - - return link; -} /* awc_attach */ - -/* - - This deletes a driver "instance". The device is de-registered - with Card Services. If it has been released, all local data - structures are freed. Otherwise, the structures will be freed - when the device is released. - -*/ - -static void awc_detach(dev_link_t *link) -{ - dev_link_t **linkp; - unsigned long flags; - int i=0; - - DEBUG(0, "awc_detach(0x%p)\n", link); - - /* Locate device structure */ - for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) - if (*linkp == link) break; - if (*linkp == NULL) - return; - - save_flags(flags); - cli(); - if (link->state & DEV_RELEASE_PENDING) { - del_timer(&link->release); - link->state &= ~DEV_RELEASE_PENDING; - } - restore_flags(flags); - - if (link->state & DEV_CONFIG) { - awc_release((u_long)link); - if (link->state & DEV_STALE_CONFIG) { - link->state |= DEV_STALE_LINK; - return; - } - } - - if (link->handle) - CardServices(DeregisterClient, link->handle); - - /* Unlink device structure, free bits */ - *linkp = link->next; - - i=0; - while ( i < MAX_AWCS) { - if (!aironet4500_devices[i]) - {i++; continue;} - if (aironet4500_devices[i] == link->priv){ - if (awc_proc_unset_fun) - awc_proc_unset_fun(i); - - aironet4500_devices[i]=0; - } - i++; - } - - if (link->priv) { - //struct net_device *dev = link->priv; - // dam dam damn mif (dev->priv) - // kfree(dev->priv); - kfree(link->priv); - } - kfree(link->dev); - kfree(link); - -} /* awc_detach */ - -/* - - awc_pcmcia_config() is scheduled to run after a CARD_INSERTION event - is received, to configure the PCMCIA socket, and to make the - ethernet device available to the system. - -*/ - -#define CS_CHECK(fn, args...) \ -while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed - -static void awc_pcmcia_config(dev_link_t *link) -{ - client_handle_t handle; - struct net_device *dev; - struct awc_private *lp; - tuple_t tuple; - int ii; - cisparse_t parse; - u_short buf[64]; - int last_fn, last_ret, i = 0; -// int ioaddr; - u16 *phys_addr; - int retval; - - handle = link->handle; - dev = link->priv; - phys_addr = (u16 *)dev->dev_addr; - - PC_DEBUG(0, "awc_pcmcia_config(0x%p)\n", link); - - tuple.Attributes = 0; - tuple.DesiredTuple = CISTPL_CONFIG; - CS_CHECK(GetFirstTuple, handle, &tuple); - tuple.TupleData = (cisdata_t *)buf; - tuple.TupleDataMax = 64; - tuple.TupleOffset = 0; - CS_CHECK(GetTupleData, handle, &tuple); - CS_CHECK(ParseTuple, handle, &tuple, &parse); - link->conf.ConfigBase = parse.config.base; - link->conf.Present = parse.config.rmask[0]; - - - /* Configure card */ - link->state |= DEV_CONFIG; - - tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; - CS_CHECK(GetFirstTuple, handle, &tuple); - - while (1) { - cistpl_cftable_entry_t dflt = { 0 }; - cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); - CFG_CHECK(GetTupleData, handle, &tuple); - CFG_CHECK(ParseTuple, handle, &tuple, &parse); - - if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg; - if (cfg->index == 0) goto next_entry; - link->conf.ConfigIndex = cfg->index; - - /* Use power settings for Vcc and Vpp if present */ - /* Note that the CIS values need to be rescaled */ - if (cfg->vcc.present & (1<conf.Vcc = cfg->vcc.param[CISTPL_POWER_VNOM]/10000; - else if (dflt.vcc.present & (1<conf.Vcc = dflt.vcc.param[CISTPL_POWER_VNOM]/10000; - - if (cfg->vpp1.present & (1<conf.Vpp1 = link->conf.Vpp2 = - cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; - else if (dflt.vpp1.present & (1<conf.Vpp1 = link->conf.Vpp2 = - dflt.vpp1.param[CISTPL_POWER_VNOM]/10000; - - /* Do we need to allocate an interrupt? */ - if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) - link->conf.Attributes |= CONF_ENABLE_IRQ; - - /* IO window settings */ - link->io.NumPorts1 = link->io.NumPorts2 = 0; - if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) { - cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io; - link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; - if (!(io->flags & CISTPL_IO_8BIT)) - link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; - if (!(io->flags & CISTPL_IO_16BIT)) { - - link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; - printk(KERN_CRIT "8-bit IO not supported on this aironet 4500 driver \n"); - } - link->io.BasePort1 = io->win[0].base; - - link->io.NumPorts1 = io->win[0].len; - if (io->nwin > 1) { - link->io.Attributes2 = link->io.Attributes1; - link->io.BasePort2 = io->win[1].base; - link->io.NumPorts2 = io->win[1].len; - } - } - ii = 0; - last_fn = RequestIO; - while ((last_ret = CardServices(RequestIO, link->handle, &link->io)) ){ - - if (ii > 4) - goto cs_failed; - link->io.BasePort1 = awc_ports[ii]; - ii++; - }; - - - break; - - next_entry: - if (CardServices(GetNextTuple, handle, &tuple)) - break; - } - - if (link->conf.Attributes & CONF_ENABLE_IRQ){ - - ii = 0; last_fn = RequestIRQ; - while ((last_ret = CardServices(RequestIRQ, link->handle, &link->irq)) ){ - - ii++; - while (!(irq_mask & (1 << ii) ) && ii < 15) - ii++; - link->irq.IRQInfo2 = 1 << ii; - - if(ii > 15) - goto cs_failed; - printk("trying irq %d , mask %x \n",ii, link->irq.IRQInfo2); - - }; - } - - CS_CHECK(RequestConfiguration, link->handle, &link->conf); - - - dev->irq = link->irq.AssignedIRQ; - dev->base_addr = link->io.BasePort1; - - - awc_private_init( dev); - - - - retval = register_netdev(dev); - if (retval != 0) { - printk(KERN_NOTICE "awc_cs: register_netdev() failed for dev %x retval %x\n",(unsigned int)dev,retval); - goto failed; - } - - if(awc_pcmcia_init(dev)) goto failed; - - i=0; - while (aironet4500_devices[i] && i < MAX_AWCS-1) i++; - if (!aironet4500_devices[i]){ - aironet4500_devices[i]=dev; - if (awc_proc_set_fun) - awc_proc_set_fun(i); - } - - - link->state &= ~DEV_CONFIG_PENDING; - - lp = (struct awc_private *)dev->priv; - - DEBUG(1,"pcmcia config complete on port %x \n",(unsigned int)dev->base_addr); - - return; - -cs_failed: - cs_error(link->handle, last_fn, last_ret); - link->dev=NULL; -failed: - - awc_release((u_long)link); - return; - -} /* awc_pcmcia_config */ - -/* - After a card is removed, awc_release() will unregister the net - device, and release the PCMCIA configuration. If the device is - still open, this will be postponed until it is closed. - -*/ - -static void awc_release(u_long arg) -{ - dev_link_t *link = (dev_link_t *)arg; - struct net_device *dev = link->priv; - - DEBUG(0, "awc_release(0x%p)\n", link); - - if (link->open) { - DEBUG(1, "awc_cs: release postponed, '%s' still open\n", - link->dev->dev_name); - link->state |= DEV_STALE_CONFIG; - return; - } - - CardServices(ReleaseConfiguration, link->handle); - CardServices(ReleaseIO, link->handle, &link->io); - CardServices(ReleaseIRQ, link->handle, &link->irq); - - CardServices(ReleaseWindow, link->win); - if (link->dev) - unregister_netdev(dev); - // link->dev = NULL; - - link->state &= ~DEV_CONFIG; - if (link->state & DEV_STALE_LINK) - awc_detach(link); - -} /* awc_release */ - -/* - - The card status event handler. Mostly, this schedules other - stuff to run after an event is received. A CARD_REMOVAL event - also sets some flags to discourage the net drivers from trying - to talk to the card any more. -*/ - -static int awc_event(event_t event, int priority, - event_callback_args_t *args) -{ - dev_link_t *link = args->client_data; - struct net_device *dev = link->priv; - - PC_DEBUG(1, "awc_event(0x%06x)\n", event); - - switch (event) { - case CS_EVENT_CARD_REMOVAL: - link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { - netif_device_detach(dev); - link->release.expires = RUN_AT( HZ/20 ); - add_timer(&link->release); - } - break; - case CS_EVENT_CARD_INSERTION: - link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; - awc_pcmcia_config(link); - break; - case CS_EVENT_PM_SUSPEND: - link->state |= DEV_SUSPEND; - /* Fall through... */ - case CS_EVENT_RESET_PHYSICAL: - if (link->state & DEV_CONFIG) { - if (link->open) - netif_device_detach(dev); - - CardServices(ReleaseConfiguration, link->handle); - } - break; - case CS_EVENT_PM_RESUME: - link->state &= ~DEV_SUSPEND; - /* Fall through... */ - case CS_EVENT_CARD_RESET: - if (link->state & DEV_CONFIG) { - CardServices(RequestConfiguration, link->handle, &link->conf); - if (link->open) { - // awc_reset(dev); - netif_device_attach(dev); - } - } - break; - } - return 0; -} /* awc_event */ - - - -static int __init aironet_cs_init(void) -{ - servinfo_t serv; - - /* Always emit the version, before any failure. */ - printk(KERN_INFO"%s", awc_version); - PC_DEBUG(0, "%s\n", version); - CardServices(GetCardServicesInfo, &serv); - if (serv.Revision != CS_RELEASE_CODE) { - printk(KERN_NOTICE "awc_cs: Card Services release " - "does not match!\n"); - return -1; - } - register_pcmcia_driver(&dev_info, &awc_attach, &awc_detach); - return 0; -} - -static void __exit aironet_cs_exit(void) -{ - DEBUG(0, "awc_cs: unloading %c ",'\n'); - unregister_pcmcia_driver(&dev_info); - - while (dev_list != NULL) { - if (dev_list->state & DEV_CONFIG) - awc_release((u_long)dev_list); - awc_detach(dev_list); - } - -// while (dev_list != NULL) -// awc_detach(dev_list); -} - -module_init(aironet_cs_init); -module_exit(aironet_cs_exit); -MODULE_LICENSE("GPL"); diff -Nru a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c --- a/drivers/net/pcmcia/axnet_cs.c Thu Feb 27 01:44:24 2003 +++ b/drivers/net/pcmcia/axnet_cs.c Thu Feb 27 01:44:24 2003 @@ -1226,7 +1226,7 @@ /* Mask interrupts from the ethercard. SMP: We have to grab the lock here otherwise the IRQ handler on another CPU can flip window and race the IRQ mask set. We end - up trashing the mcast filter not disabling irqs if we dont lock */ + up trashing the mcast filter not disabling irqs if we don't lock */ spin_lock_irqsave(&ei_local->page_lock, flags); outb_p(0x00, e8390_base + EN0_IMR); @@ -1341,7 +1341,7 @@ * Handle the ether interface interrupts. We pull packets from * the 8390 via the card specific functions and fire them at the networking * stack. We also handle transmit completions and wake the transmit path if - * neccessary. We also update the counters and do other housekeeping as + * necessary. We also update the counters and do other housekeeping as * needed. */ diff -Nru a/drivers/net/pppoe.c b/drivers/net/pppoe.c --- a/drivers/net/pppoe.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/pppoe.c Thu Feb 27 01:44:25 2003 @@ -292,7 +292,7 @@ /* Now restart from the beginning of this * hash chain. We always NULL out pppoe_dev - * so we are guarenteed to make forward + * so we are guaranteed to make forward * progress. */ po = item_hash_table[hash]; diff -Nru a/drivers/net/sb1000.c b/drivers/net/sb1000.c --- a/drivers/net/sb1000.c Thu Feb 27 01:44:17 2003 +++ b/drivers/net/sb1000.c Thu Feb 27 01:44:17 2003 @@ -170,7 +170,7 @@ if (pnp_device_attach(idev) < 0) continue; - if (pnp_activate_dev(idev, NULL) < 0) { + if (pnp_activate_dev(idev) < 0) { __again: pnp_device_detach(idev); continue; diff -Nru a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c --- a/drivers/net/sb1250-mac.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/sb1250-mac.c Thu Feb 27 01:44:30 2003 @@ -512,7 +512,7 @@ * regidx = index of register to read * * Return value: - * value read, or 0 if an error occured. + * value read, or 0 if an error occurred. ********************************************************************* */ static unsigned int sbmac_mii_read(struct sbmac_softc *s,int phyaddr,int regidx) @@ -554,7 +554,7 @@ SBMAC_WRITECSR(s->sbm_mdio,M_MAC_MDIO_DIR_INPUT); /* - * If an error occured, the PHY will signal '1' back + * If an error occurred, the PHY will signal '1' back */ error = SBMAC_READCSR(s->sbm_mdio) & M_MAC_MDIO_IN; diff -Nru a/drivers/net/sis900.c b/drivers/net/sis900.c --- a/drivers/net/sis900.c Thu Feb 27 01:44:22 2003 +++ b/drivers/net/sis900.c Thu Feb 27 01:44:22 2003 @@ -1971,7 +1971,7 @@ status = mdio_read(dev, mii_phy->phy_addr, MII_CONTROL); /* enable auto negotiation and reset the negotioation - (I dont really know what the auto negatiotiation reset + (I don't really know what the auto negatiotiation reset really means, but it sounds for me right to do one here)*/ mdio_write(dev, mii_phy->phy_addr, MII_CONTROL, status | MII_CNTL_AUTO | MII_CNTL_RST_AUTO); diff -Nru a/drivers/net/sk98lin/h/lm80.h b/drivers/net/sk98lin/h/lm80.h --- a/drivers/net/sk98lin/h/lm80.h Thu Feb 27 01:44:28 2003 +++ b/drivers/net/sk98lin/h/lm80.h Thu Feb 27 01:44:28 2003 @@ -126,7 +126,7 @@ #define LM80_IS_BTI (1<<1) /* state of BTI# pin */ #define LM80_IS_FAN1 (1<<2) /* count limit exceeded for Fan 1 */ #define LM80_IS_FAN2 (1<<3) /* count limit exceeded for Fan 2 */ -#define LM80_IS_CI (1<<4) /* Chassis Intrusion occured */ +#define LM80_IS_CI (1<<4) /* Chassis Intrusion occurred */ #define LM80_IS_OS (1<<5) /* OS temperature limit exceeded */ /* bit 6 and 7 are reserved in LM80_ISRC_2 */ #define LM80_IS_HT_IRQ_MD (1<<6) /* Hot temperature interrupt mode */ diff -Nru a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h --- a/drivers/net/sk98lin/h/skdrv1st.h Thu Feb 27 01:44:17 2003 +++ b/drivers/net/sk98lin/h/skdrv1st.h Thu Feb 27 01:44:17 2003 @@ -72,7 +72,7 @@ * Description: * * This is the first include file of the driver, which includes all - * neccessary system header files and some of the GEnesis header files. + * necessary system header files and some of the GEnesis header files. * It also defines some basic items. * * Include File Hierarchy: diff -Nru a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h --- a/drivers/net/sk98lin/h/skdrv2nd.h Thu Feb 27 01:44:31 2003 +++ b/drivers/net/sk98lin/h/skdrv2nd.h Thu Feb 27 01:44:31 2003 @@ -85,7 +85,7 @@ * Description: * * This is the second include file of the driver, which includes all other - * neccessary files and defines all structures and constants used by the + * necessary files and defines all structures and constants used by the * driver and the common modules. * * Include File Hierarchy: diff -Nru a/drivers/net/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h --- a/drivers/net/sk98lin/h/xmac_ii.h Thu Feb 27 01:44:27 2003 +++ b/drivers/net/sk98lin/h/xmac_ii.h Thu Feb 27 01:44:27 2003 @@ -279,7 +279,7 @@ * XMAC Bit Definitions * * If the bit access behaviour differs from the register access behaviour - * (r/w, ro) this is docomented after the bit number. The following bit + * (r/w, ro) this is documented after the bit number. The following bit * access behaviours are used: * (sc) self clearing * (ro) read only @@ -413,7 +413,7 @@ #define XM_ST_BC (1L<<7) /* Bit 7: Broadcast packet */ #define XM_ST_MC (1L<<6) /* Bit 6: Multicast packet */ #define XM_ST_UC (1L<<5) /* Bit 5: Unicast packet */ -#define XM_ST_TX_UR (1L<<4) /* Bit 4: FIFO Underrun occured */ +#define XM_ST_TX_UR (1L<<4) /* Bit 4: FIFO Underrun occurred */ #define XM_ST_CS_ERR (1L<<3) /* Bit 3: Carrier Sense Error */ #define XM_ST_LAT_COL (1L<<2) /* Bit 2: Late Collision Error */ #define XM_ST_MUL_COL (1L<<1) /* Bit 1: Multiple Collisions */ diff -Nru a/drivers/net/sk98lin/skcsum.c b/drivers/net/sk98lin/skcsum.c --- a/drivers/net/sk98lin/skcsum.c Thu Feb 27 01:44:17 2003 +++ b/drivers/net/sk98lin/skcsum.c Thu Feb 27 01:44:17 2003 @@ -195,7 +195,7 @@ * zero.) * * Note: - * There is a bug in the ASIC whic may lead to wrong checksums. + * There is a bug in the ASIC which may lead to wrong checksums. * * Arguments: * pAc - A pointer to the adapter context struct. diff -Nru a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c --- a/drivers/net/sk98lin/skgehwt.c Thu Feb 27 01:44:29 2003 +++ b/drivers/net/sk98lin/skgehwt.c Thu Feb 27 01:44:30 2003 @@ -61,14 +61,14 @@ * fix: chg pAc -> pAC * * Revision 1.4 1998/08/10 14:14:52 gklug - * rmv: unneccessary SK_ADDR macro + * rmv: unnecessary SK_ADDR macro * * Revision 1.3 1998/08/07 12:53:44 gklug * fix: first compiled version * * Revision 1.2 1998/08/07 09:19:29 gklug * adapt functions to the C coding conventions - * rmv unneccessary functions. + * rmv unnecessary functions. * * Revision 1.1 1998/08/05 11:28:36 gklug * first version: adapted from SMT/FDDI diff -Nru a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c --- a/drivers/net/sk98lin/skgepnmi.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/sk98lin/skgepnmi.c Thu Feb 27 01:44:27 2003 @@ -236,7 +236,7 @@ * -Fixed bug for RX counters. On an RX overflow interrupt the high * words of all RX counters were incremented. * -SET operations on FLOWCTRL_MODE and LINK_MODE accept now the - * value 0, which has no effect. It is usefull for multiple instance + * value 0, which has no effect. It is useful for multiple instance * SETs. * * Revision 1.37 1998/11/20 08:02:04 mhaveman @@ -1639,7 +1639,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed - * SK_PNMI_ERR_GENERAL A general severe internal error occured + * SK_PNMI_ERR_GENERAL A general severe internal error occurred * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to take * the data. * SK_PNMI_ERR_UNKNOWN_OID The requested OID is unknown @@ -1672,13 +1672,13 @@ * Description: * Calls a general sub-function for all this stuff. The preset does * the same as a set, but returns just before finally setting the - * new value. This is usefull to check if a set might be successfull. + * new value. This is useful to check if a set might be successful. * If as instance a -1 is passed, an array of values is supposed and * all instance of the OID will be set. * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -1716,13 +1716,13 @@ * Description: * Calls a general sub-function for all this stuff. The preset does * the same as a set, but returns just before finally setting the - * new value. This is usefull to check if a set might be successfull. + * new value. This is useful to check if a set might be successful. * If as instance a -1 is passed, an array of values is supposed and * all instance of the OID will be set. * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -1766,7 +1766,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed - * SK_PNMI_ERR_GENERAL A general severe internal error occured + * SK_PNMI_ERR_GENERAL A general severe internal error occurred * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to take * the data. * SK_PNMI_ERR_UNKNOWN_NET The requested NetIndex doesn't exist @@ -1935,7 +1935,7 @@ * Description: * Calls a general sub-function for all this set stuff. The preset does * the same as a set, but returns just before finally setting the - * new value. This is usefull to check if a set might be successfull. + * new value. This is useful to check if a set might be successful. * The sub-function runs through the IdTable, checks which OIDs are able * to set, and calls the handler function of the OID to perform the * preset. The return value of the function will also be stored in @@ -1944,7 +1944,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -1983,7 +1983,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -2934,7 +2934,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -3002,7 +3002,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -3137,7 +3137,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -3280,7 +3280,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -3427,7 +3427,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -3639,7 +3639,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -3758,7 +3758,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -4003,7 +4003,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -4482,7 +4482,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -5189,7 +5189,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -5498,7 +5498,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -5698,7 +5698,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -6362,7 +6362,7 @@ * * Returns: * SK_PNMI_ERR_OK The request was successfully performed. - * SK_PNMI_ERR_GENERAL A general severe internal error occured. + * SK_PNMI_ERR_GENERAL A general severe internal error occurred. * SK_PNMI_ERR_TOO_SHORT The passed buffer is too short to contain * the correct data (e.g. a 32bit value is * needed, but a 16 bit value was passed). @@ -6813,7 +6813,7 @@ * * Description: * The COMMON module only tells us if the mode is half or full duplex. - * But in the decade of auto sensing it is usefull for the user to + * But in the decade of auto sensing it is useful for the user to * know if the mode was negotiated or forced. Therefore we have a * look to the mode, which was last used by the negotiation process. * @@ -7364,7 +7364,7 @@ * * Description: * The trap buffer stores various events. A user application somehow - * gets notified that an event occured and retrieves the trap buffer + * gets notified that an event occurred and retrieves the trap buffer * contens (or simply polls the buffer). The buffer is organized as * a ring which stores the newest traps at the beginning. The oldest * traps are overwritten by the newest ones. Each trap entry has a diff -Nru a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c --- a/drivers/net/sk98lin/skgesirq.c Thu Feb 27 01:44:16 2003 +++ b/drivers/net/sk98lin/skgesirq.c Thu Feb 27 01:44:16 2003 @@ -736,14 +736,14 @@ /* Check whether XMACs are correctly initialized */ if ((Istatus & (IS_PA_TO_RX1 | IS_PA_TO_TX1)) && !pAC->GIni.GP[MAC_1].PState) { - /* XMAC was not initialized but Packet timeout occured */ + /* XMAC was not initialized but Packet timeout occurred */ SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E004, SKERR_SIRQ_E004MSG); } if ((Istatus & (IS_PA_TO_RX2 | IS_PA_TO_TX2)) && !pAC->GIni.GP[MAC_2].PState) { - /* XMAC was not initialized but Packet timeout occured */ + /* XMAC was not initialized but Packet timeout occurred */ SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E005, SKERR_SIRQ_E005MSG); } @@ -1111,7 +1111,7 @@ * otherwise the Linux driver will have a problem. */ /* - * We received a bunch of frames or no CRC error occured on the + * We received a bunch of frames or no CRC error occurred on the * network -> ok. */ pPrt->PPrevRx = RxCts; @@ -1379,7 +1379,7 @@ pPrt->PAutoNegTOCt ++; /* - * Timeout occured. + * Timeout occurred. * What do we need now? */ SK_DBG_MSG(pAC,SK_DBGMOD_HWM, @@ -1389,7 +1389,7 @@ if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE && pPrt->PLipaAutoNeg != SK_LIPA_AUTO) { /* - * Timeout occured + * Timeout occurred * Set Link manually up. */ SkHWSenseSetNext(pAC, IoC, Port, SK_LMODE_FULL); @@ -1872,7 +1872,7 @@ pPrt->PAutoNegTimeOut ++; if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) { /* - * Timeout occured. + * Timeout occurred. * What do we need now? */ SK_DBG_MSG(pAC,SK_DBGMOD_HWM, @@ -1882,7 +1882,7 @@ if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE && pPrt->PLipaAutoNeg != SK_LIPA_AUTO) { /* - * Timeout occured + * Timeout occurred * Set Link manually up. */ SkHWSenseSetNext(pAC, IoC, Port, diff -Nru a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c --- a/drivers/net/sk98lin/ski2c.c Thu Feb 27 01:44:16 2003 +++ b/drivers/net/sk98lin/ski2c.c Thu Feb 27 01:44:16 2003 @@ -178,7 +178,7 @@ * Revision 1.2 1998/08/11 07:27:15 gklug * add: functions of the interface * adapt rest of source to C coding Conventions - * rmv: unneccessary code taken from Mona Lisa + * rmv: unnecessary code taken from Mona Lisa * * Revision 1.1 1998/06/19 14:28:43 malthoff * Created. Sources taken from ML Projekt. diff -Nru a/drivers/net/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c --- a/drivers/net/sk98lin/skqueue.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/sk98lin/skqueue.c Thu Feb 27 01:44:20 2003 @@ -153,7 +153,7 @@ * send command to state machine * end * return error reported by individual Event function - * 0 if no error occured. + * 0 if no error occurred. */ int SkEventDispatcher( SK_AC *pAC, /* Adapters Context */ diff -Nru a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c --- a/drivers/net/sk98lin/skvpd.c Thu Feb 27 01:44:24 2003 +++ b/drivers/net/sk98lin/skvpd.c Thu Feb 27 01:44:24 2003 @@ -563,7 +563,7 @@ /* * find the Keyword 'key' in the VPD buffer and fills the - * parameter sturct 'p' with it's values + * parameter sturct 'p' with its values * * returns *p success * 0: parameter was not found or VPD encoding error diff -Nru a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c --- a/drivers/net/sk98lin/skxmac2.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/sk98lin/skxmac2.c Thu Feb 27 01:44:30 2003 @@ -596,7 +596,7 @@ * none, National: 80ns). * * ATTENTION: - * It is absolutely neccessary to reset the SW_RST Bit first + * It is absolutely necessary to reset the SW_RST Bit first * before calling this function. * * Returns: diff -Nru a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c --- a/drivers/net/sk_mca.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/sk_mca.c Thu Feb 27 01:44:25 2003 @@ -45,7 +45,7 @@ May 23nd, 1999 can receive frames, send frames May 24th, 1999 - modularized intialization of LANCE + modularized initialization of LANCE loadable as module still Tx problem :-( May 26th, 1999 @@ -581,7 +581,7 @@ return GetLANCE(dev, LANCE_CSR0); } -/* did we loose blocks due to a FIFO overrun ? */ +/* did we lose blocks due to a FIFO overrun ? */ static u16 irqmiss_handler(struct SKMCA_NETDEV *dev, u16 oldcsr0) { diff -Nru a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h --- a/drivers/net/skfp/h/smc.h Thu Feb 27 01:44:19 2003 +++ b/drivers/net/skfp/h/smc.h Thu Feb 27 01:44:19 2003 @@ -320,7 +320,7 @@ u_char evc_rep_required ; /* report required */ u_short evc_para ; /* SMT Para Number */ u_char *evc_cond_state ; /* condition state */ - u_char *evc_multiple ; /* multiple occurence */ + u_char *evc_multiple ; /* multiple occurrence */ } ; /* diff -Nru a/drivers/net/skfp/hwt.c b/drivers/net/skfp/hwt.c --- a/drivers/net/skfp/hwt.c Thu Feb 27 01:44:18 2003 +++ b/drivers/net/skfp/hwt.c Thu Feb 27 01:44:18 2003 @@ -264,7 +264,7 @@ * para start start time * duration time to wait * - * NOTE: The fuction will return immediatly, if the timer is not + * NOTE: The fuction will return immediately, if the timer is not * started ************************/ void hwt_wait_time(smc,start,duration) diff -Nru a/drivers/net/slhc.c b/drivers/net/slhc.c --- a/drivers/net/slhc.c Thu Feb 27 01:44:19 2003 +++ b/drivers/net/slhc.c Thu Feb 27 01:44:19 2003 @@ -265,7 +265,7 @@ /* Bail if the TCP packet isn't `compressible' (i.e., ACK isn't set or * some other control bit is set). Also uncompressible if - * its a runt. + * it's a runt. */ if(hlen > isize || th->syn || th->fin || th->rst || ! (th->ack)){ diff -Nru a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c --- a/drivers/net/smc-ultra.c Thu Feb 27 01:44:19 2003 +++ b/drivers/net/smc-ultra.c Thu Feb 27 01:44:19 2003 @@ -293,7 +293,7 @@ /* Avoid already found cards from previous calls */ if (pnp_device_attach(idev) < 0) continue; - if (pnp_activate_dev(idev, NULL) < 0) { + if (pnp_activate_dev(idev) < 0) { __again: pnp_device_detach(idev); continue; diff -Nru a/drivers/net/sungem.c b/drivers/net/sungem.c --- a/drivers/net/sungem.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/sungem.c Thu Feb 27 01:44:30 2003 @@ -2991,7 +2991,7 @@ gem_begin_auto_negotiation(gp, NULL); spin_unlock_irq(&gp->lock); - /* It is guarenteed that the returned buffer will be at least + /* It is guaranteed that the returned buffer will be at least * PAGE_SIZE aligned. */ gp->init_block = (struct gem_init_block *) diff -Nru a/drivers/net/sungem.h b/drivers/net/sungem.h --- a/drivers/net/sungem.h Thu Feb 27 01:44:24 2003 +++ b/drivers/net/sungem.h Thu Feb 27 01:44:24 2003 @@ -562,7 +562,7 @@ */ /* Statistics Registers. All of these registers are 16-bits and - * track occurances of a specific event. GEM can be configured + * track occurrences of a specific event. GEM can be configured * to interrupt the host cpu when any of these counters overflow. * They should all be explicitly initialized to zero when the interface * is brought up. @@ -830,7 +830,7 @@ * RX Kick register) by the driver it must make sure the buffers are * truly ready and that the ownership bits are set properly. * - * Even though GEM modifies the RX descriptors, it guarentees that the + * Even though GEM modifies the RX descriptors, it guarantees that the * buffer DMA address field will stay the same when it performs these * updates. Therefore it can be used to keep track of DMA mappings * by the host driver just as in the TX descriptor case above. diff -Nru a/drivers/net/sunhme.c b/drivers/net/sunhme.c --- a/drivers/net/sunhme.c Thu Feb 27 01:44:21 2003 +++ b/drivers/net/sunhme.c Thu Feb 27 01:44:21 2003 @@ -1198,7 +1198,7 @@ * (ETH_FRAME_LEN + 64 + 2) = (1514 + 64 + 2) = 1580 bytes. * * First our alloc_skb() routine aligns the data base to a 64 byte - * boundry. We now have 0xf001b040 as our skb data address. We + * boundary. We now have 0xf001b040 as our skb data address. We * plug this into the receive descriptor address. * * Next, we skb_reserve() 2 bytes to account for the Happy Meal offset. @@ -1651,7 +1651,7 @@ hme_read32(hp, etxregs + ETX_CFG) | ETX_CFG_DMAENABLE); /* This chip really rots, for the receiver sometimes when you - * write to it's control registers not all the bits get there + * write to its control registers not all the bits get there * properly. I cannot think of a sane way to provide complete * coverage for this hardware bug yet. */ diff -Nru a/drivers/net/sunhme.h b/drivers/net/sunhme.h --- a/drivers/net/sunhme.h Thu Feb 27 01:44:22 2003 +++ b/drivers/net/sunhme.h Thu Feb 27 01:44:22 2003 @@ -298,7 +298,7 @@ #define CSCONFIG_NDISABLE 0x8000 /* Disable NRZI */ /* Happy Meal descriptor rings and such. - * All descriptor rings must be aligned on a 2K boundry. + * All descriptor rings must be aligned on a 2K boundary. * All receive buffers must be 64 byte aligned. * Always write the address first before setting the ownership * bits to avoid races with the hardware scanning the ring. diff -Nru a/drivers/net/sunlance.c b/drivers/net/sunlance.c --- a/drivers/net/sunlance.c Thu Feb 27 01:44:21 2003 +++ b/drivers/net/sunlance.c Thu Feb 27 01:44:21 2003 @@ -647,7 +647,7 @@ u8 *p8; unsigned long pbuf = (unsigned long) piobuf; - /* We know here that both src and dest are on a 16bit boundry. */ + /* We know here that both src and dest are on a 16bit boundary. */ *p16++ = sbus_readw(pbuf); p32 = (u32 *) p16; pbuf += 2; diff -Nru a/drivers/net/tg3.c b/drivers/net/tg3.c --- a/drivers/net/tg3.c Thu Feb 27 01:44:24 2003 +++ b/drivers/net/tg3.c Thu Feb 27 01:44:24 2003 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -54,8 +55,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.4" -#define DRV_MODULE_RELDATE "Feb 1, 2003" +#define DRV_MODULE_VERSION "1.4c" +#define DRV_MODULE_RELDATE "Feb 18, 2003" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -216,6 +217,12 @@ tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW); } +static inline void tg3_cond_int(struct tg3 *tp) +{ + if (tp->hw_status->status & SD_STATUS_UPDATED) + tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl | GRC_LCLCTRL_SETINT); +} + static void tg3_enable_ints(struct tg3 *tp) { tw32(TG3PCI_MISC_HOST_CTRL, @@ -223,9 +230,55 @@ tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000000); tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW); - if (tp->hw_status->status & SD_STATUS_UPDATED) - tw32(GRC_LOCAL_CTRL, - tp->grc_local_ctrl | GRC_LCLCTRL_SETINT); + tg3_cond_int(tp); +} + +/* these netif_xxx funcs should be moved into generic net layer */ +static void netif_poll_disable(struct net_device *dev) +{ + while (test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state)) { + current->state = TASK_INTERRUPTIBLE; + schedule_timeout(1); + } +} + +static inline void netif_poll_enable(struct net_device *dev) +{ + clear_bit(__LINK_STATE_RX_SCHED, &dev->state); +} + +/* same as netif_rx_complete, except that local_irq_save(flags) + * has already been issued + */ +static inline void __netif_rx_complete(struct net_device *dev) +{ + if (!test_bit(__LINK_STATE_RX_SCHED, &dev->state)) BUG(); + list_del(&dev->poll_list); + clear_bit(__LINK_STATE_RX_SCHED, &dev->state); +} + +static inline void netif_tx_disable(struct net_device *dev) +{ + spin_lock_bh(&dev->xmit_lock); + netif_stop_queue(dev); + spin_unlock_bh(&dev->xmit_lock); +} + +static inline void tg3_netif_stop(struct tg3 *tp) +{ + netif_poll_disable(tp->dev); + netif_tx_disable(tp->dev); +} + +static inline void tg3_netif_start(struct tg3 *tp) +{ + netif_wake_queue(tp->dev); + /* NOTE: unconditional netif_wake_queue is only appropriate + * so long as all callers are assured to have free tx slots + * (such as after tg3_init_hw) + */ + netif_poll_enable(tp->dev); + tg3_cond_int(tp); } static void tg3_switch_clocks(struct tg3 *tp) @@ -387,7 +440,6 @@ } static int tg3_setup_phy(struct tg3 *); -static int tg3_halt(struct tg3 *); static int tg3_set_power_state(struct tg3 *tp, int state) { @@ -458,8 +510,6 @@ tg3_setup_phy(tp); } - tg3_halt(tp); - pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps); if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE) { @@ -2044,7 +2094,12 @@ spin_unlock(&tp->tx_lock); } - /* run RX thread, within the bounds set by NAPI */ + spin_unlock_irqrestore(&tp->lock, flags); + + /* run RX thread, within the bounds set by NAPI. + * All RX "locking" is done by ensuring outside + * code synchronizes with dev->poll() + */ done = 1; if (sblk->idx[0].rx_producer != tp->rx_rcb_ptr) { int orig_budget = *budget; @@ -2064,12 +2119,12 @@ /* if no more work, tell net stack and NIC we're done */ if (done) { - netif_rx_complete(netdev); + spin_lock_irqsave(&tp->lock, flags); + __netif_rx_complete(netdev); tg3_enable_ints(tp); + spin_unlock_irqrestore(&tp->lock, flags); } - spin_unlock_irqrestore(&tp->lock, flags); - return (done ? 0 : 1); } @@ -2136,17 +2191,21 @@ static void tg3_init_rings(struct tg3 *); static int tg3_init_hw(struct tg3 *); +static int tg3_halt(struct tg3 *); -static void tg3_tx_timeout(struct net_device *dev) +static void tg3_reset_task(void *_data) { - struct tg3 *tp = dev->priv; + struct tg3 *tp = _data; + unsigned int restart_timer; - printk(KERN_ERR PFX "%s: transmit timed out, resetting\n", - dev->name); + tg3_netif_stop(tp); spin_lock_irq(&tp->lock); spin_lock(&tp->tx_lock); + restart_timer = tp->tg3_flags2 & TG3_FLG2_RESTART_TIMER; + tp->tg3_flags2 &= ~TG3_FLG2_RESTART_TIMER; + tg3_halt(tp); tg3_init_rings(tp); tg3_init_hw(tp); @@ -2154,7 +2213,20 @@ spin_unlock(&tp->tx_lock); spin_unlock_irq(&tp->lock); - netif_wake_queue(dev); + tg3_netif_start(tp); + + if (restart_timer) + mod_timer(&tp->timer, jiffies + 1); +} + +static void tg3_tx_timeout(struct net_device *dev) +{ + struct tg3 *tp = dev->priv; + + printk(KERN_ERR PFX "%s: transmit timed out, resetting\n", + dev->name); + + schedule_work(&tp->reset_task); } #if !PCI_DMA_BUS_IS_PHYS @@ -2194,7 +2266,7 @@ int i; #if !PCI_DMA_BUS_IS_PHYS - /* IOMMU, just map the guilty area again which is guarenteed to + /* IOMMU, just map the guilty area again which is guaranteed to * use different addresses. */ @@ -2229,7 +2301,7 @@ return -1; } - /* New SKB is guarenteed to be linear. */ + /* New SKB is guaranteed to be linear. */ entry = *start; new_addr = pci_map_single(tp->pdev, new_skb->data, new_skb->len, PCI_DMA_TODEVICE); @@ -2686,6 +2758,7 @@ return 0; } + tg3_netif_stop(tp); spin_lock_irq(&tp->lock); spin_lock(&tp->tx_lock); @@ -2698,6 +2771,7 @@ spin_unlock(&tp->tx_lock); spin_unlock_irq(&tp->lock); + tg3_netif_start(tp); return 0; } @@ -3073,6 +3147,7 @@ static void tg3_chip_reset(struct tg3 *tp) { u32 val; + u32 flags_save; /* Force NVRAM to settle. * This deals with a chip bug which can result in EEPROM @@ -3089,8 +3164,21 @@ } } + /* + * We must avoid the readl() that normally takes place. + * It locks machines, causes machine checks, and other + * fun things. So, temporarily disable the 5701 + * hardware workaround, while we do the reset. + */ + flags_save = tp->tg3_flags; + tp->tg3_flags &= ~TG3_FLAG_5701_REG_WRITE_BUG; + + /* do the reset */ tw32(GRC_MISC_CFG, GRC_MISC_CFG_CORECLK_RESET); + /* restore 5701 hardware bug workaround flag */ + tp->tg3_flags = flags_save; + /* Flush PCI posted writes. The normal MMIO registers * are inaccessible at this time so this is the only * way to make this reliably. I tried to use indirect @@ -3303,7 +3391,7 @@ 0x00000000 }; -#if 0 /* All zeros, dont eat up space with it. */ +#if 0 /* All zeros, don't eat up space with it. */ u32 tg3FwData[(TG3_FW_DATA_LEN / sizeof(u32)) + 1] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 @@ -3736,7 +3824,7 @@ 0x00000000 }; -#if 0 /* All zeros, dont eat up space with it. */ +#if 0 /* All zeros, don't eat up space with it. */ u32 tg3TsoFwData[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 @@ -4394,9 +4482,11 @@ } if (!(tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) { - tg3_halt(tp); - tg3_init_rings(tp); - tg3_init_hw(tp); + tp->tg3_flags2 |= TG3_FLG2_RESTART_TIMER; + spin_unlock(&tp->tx_lock); + spin_unlock_irqrestore(&tp->lock, flags); + schedule_work(&tp->reset_task); + return; } /* This part only runs once per second. */ @@ -4527,8 +4617,6 @@ return err; } - netif_start_queue(dev); - spin_lock_irq(&tp->lock); spin_lock(&tp->tx_lock); @@ -4537,6 +4625,8 @@ spin_unlock(&tp->tx_lock); spin_unlock_irq(&tp->lock); + netif_start_queue(dev); + return 0; } @@ -5302,6 +5392,7 @@ (ering.tx_pending > TG3_TX_RING_SIZE - 1)) return -EINVAL; + tg3_netif_stop(tp); spin_lock_irq(&tp->lock); spin_lock(&tp->tx_lock); @@ -5315,6 +5406,7 @@ netif_wake_queue(tp->dev); spin_unlock(&tp->tx_lock); spin_unlock_irq(&tp->lock); + tg3_netif_start(tp); return 0; } @@ -5337,6 +5429,7 @@ if (copy_from_user(&epause, useraddr, sizeof(epause))) return -EFAULT; + tg3_netif_stop(tp); spin_lock_irq(&tp->lock); spin_lock(&tp->tx_lock); if (epause.autoneg) @@ -5356,6 +5449,7 @@ tg3_init_hw(tp); spin_unlock(&tp->tx_lock); spin_unlock_irq(&tp->lock); + tg3_netif_start(tp); return 0; } @@ -5941,7 +6035,7 @@ /* Force memory write invalidate off. If we leave it on, * then on 5700_BX chips we have to enable a workaround. - * The workaround is to set the TG3PCI_DMA_RW_CTRL boundry + * The workaround is to set the TG3PCI_DMA_RW_CTRL boundary * to match the cacheline size. The Broadcom driver have this * workaround but turns MWI off all the times so never uses * it. This seems to suggest that the workaround is insufficient. @@ -6710,6 +6804,7 @@ spin_lock_init(&tp->lock); spin_lock_init(&tp->tx_lock); spin_lock_init(&tp->indirect_lock); + PREPARE_WORK(&tp->reset_task, tg3_reset_task, tp); tp->regs = (unsigned long) ioremap(tg3reg_base, tg3reg_len); if (tp->regs == 0UL) { @@ -6851,6 +6946,8 @@ if (!netif_running(dev)) return 0; + tg3_netif_stop(tp); + spin_lock_irq(&tp->lock); spin_lock(&tp->tx_lock); tg3_disable_ints(tp); @@ -6877,6 +6974,7 @@ spin_unlock_irq(&tp->lock); netif_device_attach(dev); + tg3_netif_start(tp); } return err; @@ -6906,6 +7004,8 @@ spin_unlock(&tp->tx_lock); spin_unlock_irq(&tp->lock); + + tg3_netif_start(tp); return 0; } diff -Nru a/drivers/net/tg3.h b/drivers/net/tg3.h --- a/drivers/net/tg3.h Thu Feb 27 01:44:20 2003 +++ b/drivers/net/tg3.h Thu Feb 27 01:44:20 2003 @@ -1821,6 +1821,8 @@ #define TG3_FLAG_GOT_SERDES_FLOWCTL 0x20000000 #define TG3_FLAG_SPLIT_MODE 0x40000000 #define TG3_FLAG_INIT_COMPLETE 0x80000000 + u32 tg3_flags2; +#define TG3_FLG2_RESTART_TIMER 0x00000001 u32 split_mode_max_reqs; #define SPLIT_MODE_5704_MAX_REQ 3 @@ -1889,6 +1891,7 @@ struct tg3_hw_stats *hw_stats; dma_addr_t stats_mapping; + struct work_struct reset_task; }; #endif /* !(_T3_H) */ diff -Nru a/drivers/net/tlan.c b/drivers/net/tlan.c --- a/drivers/net/tlan.c Thu Feb 27 01:44:18 2003 +++ b/drivers/net/tlan.c Thu Feb 27 01:44:18 2003 @@ -1630,7 +1630,7 @@ * host_int The contents of the HOST_INT * port. * - * This driver is structured to determine EOC occurances by + * This driver is structured to determine EOC occurrences by * reading the CSTAT member of the list structure. Tx EOC * interrupts are disabled via the DIO INTDIS register. * However, TLAN chips before revision 3.0 didn't have this @@ -1753,7 +1753,7 @@ * host_int The contents of the HOST_INT * port. * - * This driver is structured to determine EOC occurances by + * This driver is structured to determine EOC occurrences by * reading the CSTAT member of the list structure. Rx EOC * interrupts are disabled via the DIO INTDIS register. * However, TLAN chips before revision 3.0 didn't have this @@ -2399,7 +2399,7 @@ * dev A pointer to the device structure of the * TLAN device having the PHYs to be detailed. * - * This function prints the registers a PHY (aka tranceiver). + * This function prints the registers a PHY (aka transceiver). * ********************************************************************/ @@ -2515,7 +2515,7 @@ /* Wait for 50 ms and powerup * This is abitrary. It is intended to make sure the - * tranceiver settles. + * transceiver settles. */ TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP ); @@ -2535,7 +2535,7 @@ TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value ); TLan_MiiSync(dev->base_addr); /* Wait for 500 ms and reset the - * tranceiver. The TLAN docs say both 50 ms and + * transceiver. The TLAN docs say both 50 ms and * 500 ms, so do the longer, just in case. */ TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET ); @@ -2650,7 +2650,7 @@ TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tctl ); } - /* Wait for 2 sec to give the tranceiver time + /* Wait for 2 sec to give the transceiver time * to establish link. */ TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET ); diff -Nru a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c --- a/drivers/net/tokenring/lanstreamer.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/tokenring/lanstreamer.c Thu Feb 27 01:44:30 2003 @@ -542,7 +542,7 @@ writew(readw(streamer_mmio + LAPWWO) + 6, streamer_mmio + LAPA); if (readw(streamer_mmio + LAPD)) { - printk(KERN_INFO "tokenring card intialization failed. errorcode : %x\n", + printk(KERN_INFO "tokenring card initialization failed. errorcode : %x\n", ntohs(readw(streamer_mmio + LAPD))); release_region(dev->base_addr, STREAMER_IO_SPACE); return -1; diff -Nru a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c --- a/drivers/net/tokenring/madgemc.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/tokenring/madgemc.c Thu Feb 27 01:44:30 2003 @@ -80,7 +80,7 @@ static void madgemc_interrupt(int irq, void *dev_id, struct pt_regs *regs); /* - * These work around paging, however they dont guarentee you're on the + * These work around paging, however they don't guarentee you're on the * right page. */ #define SIFREADB(reg) (inb(dev->base_addr + ((reg<0x8)?reg:reg-0x8))) diff -Nru a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c --- a/drivers/net/tokenring/olympic.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/tokenring/olympic.c Thu Feb 27 01:44:27 2003 @@ -384,7 +384,7 @@ } #endif if(readw(init_srb+6)) { - printk(KERN_INFO "tokenring card intialization failed. errorcode : %x\n",readw(init_srb+6)); + printk(KERN_INFO "tokenring card initialization failed. errorcode : %x\n",readw(init_srb+6)); return -ENODEV; } diff -Nru a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c --- a/drivers/net/tokenring/smctr.c Thu Feb 27 01:44:23 2003 +++ b/drivers/net/tokenring/smctr.c Thu Feb 27 01:44:23 2003 @@ -417,7 +417,7 @@ tp->tx_buff_end[BUG_QUEUE] = (__u16 *)smctr_malloc(dev, 0); /* Allocate MAC receive data buffers. - * MAC Rx buffer doesn't have to be on a 256 byte boundry. + * MAC Rx buffer doesn't have to be on a 256 byte boundary. */ tp->rx_buff_head[MAC_QUEUE] = (__u16 *)smctr_malloc(dev, RX_DATA_BUFFER_SIZE * tp->num_rx_bdbs[MAC_QUEUE]); @@ -438,7 +438,7 @@ * To guarantee a minimum of 256 contigous memory to * UM_Receive_Packet's lookahead pointer, before a page * change or ring end is encountered, place each rx buffer on - * a 256 byte boundry. + * a 256 byte boundary. */ smctr_malloc(dev, TO_256_BYTE_BOUNDRY(tp->sh_mem_used)); tp->rx_buff_head[NON_MAC_QUEUE] = (__u16 *)smctr_malloc(dev, @@ -1331,7 +1331,7 @@ mem_used += tp->tx_buff_size[BUG_QUEUE]; /* Allocate MAC receive data buffers. - * MAC receive buffers don't have to be on a 256 byte boundry. + * MAC receive buffers don't have to be on a 256 byte boundary. */ mem_used += RX_DATA_BUFFER_SIZE * tp->num_rx_bdbs[MAC_QUEUE]; @@ -1348,7 +1348,7 @@ * * Make sure the mem_used offset at this point is the * same as in allocate_shared memory or the following - * boundry adjustment will be incorrect (i.e. not allocating + * boundary adjustment will be incorrect (i.e. not allocating * the non-mac receive buffers above cannot change the 256 * byte offset). * @@ -3930,7 +3930,7 @@ return (err); } -/* Adapter RAM test. Incremental word ODD boundry data test. */ +/* Adapter RAM test. Incremental word ODD boundary data test. */ static int smctr_ram_memory_test(struct net_device *dev) { struct net_local *tp = (struct net_local *)dev->priv; @@ -3947,7 +3947,7 @@ pages_of_ram = tp->ram_size / tp->ram_usable; pword = tp->ram_access; - /* Incremental word ODD boundry test. */ + /* Incremental word ODD boundary test. */ for(page = 0; (page < pages_of_ram) && (~err); page++, start_pattern += 0x8000) { @@ -5598,7 +5598,7 @@ /* if all transmit buffer are cleared * need to set the tx_buff_curr[] to tx_buff_head[] * otherwise, tx buffer will be segregate and cannot - * accomodate and buffer greater than (curr - head) and + * accommodate and buffer greater than (curr - head) and * (end - curr) since we do not allow wrap around allocation. */ if(tp->tx_buff_used[queue] == 0) diff -Nru a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c --- a/drivers/net/tulip/interrupt.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/tulip/interrupt.c Thu Feb 27 01:44:20 2003 @@ -487,7 +487,7 @@ * to the 21142/3 docs that is). * -- rmk */ - printk(KERN_ERR "%s: (%lu) System Error occured (%d)\n", + printk(KERN_ERR "%s: (%lu) System Error occurred (%d)\n", dev->name, tp->nir, error); } /* Clear all error sources, included undocumented ones! */ diff -Nru a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c --- a/drivers/net/tulip/tulip_core.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/tulip/tulip_core.c Thu Feb 27 01:44:25 2003 @@ -1306,7 +1306,7 @@ /* Intel Saturn. Switch to 8 long words burst, 8 long word cache aligned Aries might need this too. The Saturn errata are not pretty reading but - thankfully its an old 486 chipset. + thankfully it's an old 486 chipset. */ if (pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424, NULL)) { diff -Nru a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c --- a/drivers/net/tulip/winbond-840.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/tulip/winbond-840.c Thu Feb 27 01:44:20 2003 @@ -597,7 +597,7 @@ #define mdio_delay(mdio_addr) readl(mdio_addr) /* Set iff a MII transceiver on any interface requires mdio preamble. - This only set with older tranceivers, so the extra + This only set with older transceivers, so the extra code size of a per-interface flag is not worthwhile. */ static char mii_preamble_required = 1; diff -Nru a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c --- a/drivers/net/tulip/xircom_cb.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/tulip/xircom_cb.c Thu Feb 27 01:44:27 2003 @@ -121,7 +121,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_private *card, int descnr, unsigned int bufferoffset); static void investigate_write_descriptor(struct net_device *dev, struct xircom_private *card, int descnr, unsigned int bufferoffset); static void read_mac_address(struct xircom_private *card); -static void tranceiver_voodoo(struct xircom_private *card); +static void transceiver_voodoo(struct xircom_private *card); static void initialize_card(struct xircom_private *card); static void trigger_transmit(struct xircom_private *card); static void trigger_receive(struct xircom_private *card); @@ -301,7 +301,7 @@ /* start the transmitter to get a heartbeat */ /* TODO: send 2 dummy packets here */ - tranceiver_voodoo(private); + transceiver_voodoo(private); spin_lock_irqsave(&private->lock,flags); activate_transmitter(private); @@ -1116,15 +1116,15 @@ /* - tranceiver_voodoo() enables the external UTP plug thingy. + transceiver_voodoo() enables the external UTP plug thingy. it's called voodoo as I stole this code and cannot cross-reference it with the specification. */ -static void tranceiver_voodoo(struct xircom_private *card) +static void transceiver_voodoo(struct xircom_private *card) { unsigned long flags; - enter("tranceiver_voodoo"); + enter("transceiver_voodoo"); /* disable all powermanagement */ pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000); @@ -1143,7 +1143,7 @@ spin_unlock_irqrestore(&card->lock, flags); netif_start_queue(card->dev); - leave("tranceiver_voodoo"); + leave("transceiver_voodoo"); } diff -Nru a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c --- a/drivers/net/tulip/xircom_tulip_cb.c Thu Feb 27 01:44:19 2003 +++ b/drivers/net/tulip/xircom_tulip_cb.c Thu Feb 27 01:44:19 2003 @@ -486,7 +486,7 @@ /* * To quote Arjan van de Ven: - * tranceiver_voodoo() enables the external UTP plug thingy. + * transceiver_voodoo() enables the external UTP plug thingy. * it's called voodoo as I stole this code and cannot cross-reference * it with the specification. * Actually it seems to go like this: diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c --- a/drivers/net/via-rhine.c Thu Feb 27 01:44:30 2003 +++ b/drivers/net/via-rhine.c Thu Feb 27 01:44:30 2003 @@ -132,7 +132,7 @@ Both 'options[]' and 'full_duplex[]' should exist for driver interoperability. The media type is usually passed in 'options[]'. - The default is autonegotation for speed and duplex. + The default is autonegotiation for speed and duplex. This should rarely be overridden. Use option values 0x10/0x20 for 10Mbps, 0x100,0x200 for 100Mbps. Use option values 0x10 and 0x100 for forcing half duplex fixed speed. diff -Nru a/drivers/net/wan/comx-hw-munich.c b/drivers/net/wan/comx-hw-munich.c --- a/drivers/net/wan/comx-hw-munich.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/wan/comx-hw-munich.c Thu Feb 27 01:44:20 2003 @@ -1304,7 +1304,7 @@ ch = (struct comx_channel *)dev->priv; hw = (struct slicecom_privdata *)ch->HW_privdata; - /* We dont trust the "Tx available" info from the TIQ, but check */ + /* We don't trust the "Tx available" info from the TIQ, but check */ /* every ring if there is some free room */ if (ch->init_status && netif_running(dev)) diff -Nru a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c --- a/drivers/net/wan/dlci.c Thu Feb 27 01:44:23 2003 +++ b/drivers/net/wan/dlci.c Thu Feb 27 01:44:23 2003 @@ -14,7 +14,7 @@ * 0.15 Mike Mclagan Packet freeing, bug in kmalloc call * DLCI_RET handling * 0.20 Mike McLagan More conservative on which packets - * are returned for retry and whic are + * are returned for retry and which are * are dropped. If DLCI_RET_DROP is * returned from the FRAD, the packet is * sent back to Linux for re-transmission diff -Nru a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c --- a/drivers/net/wan/dscc4.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/wan/dscc4.c Thu Feb 27 01:44:20 2003 @@ -47,7 +47,7 @@ * Tx direction * When the tx ring is full, the xmit routine issues a call to netdev_stop. * The device is supposed to be enabled again during an ALLS irq (we could - * use HI but as it's easy to loose events, it's fscked). + * use HI but as it's easy to lose events, it's fscked). * * Rx direction * The received frames aren't supposed to span over multiple receiving areas. diff -Nru a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c --- a/drivers/net/wan/hostess_sv11.c Thu Feb 27 01:44:26 2003 +++ b/drivers/net/wan/hostess_sv11.c Thu Feb 27 01:44:26 2003 @@ -55,13 +55,13 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb) { - /* Drop the CRC - its not a good idea to try and negotiate it ;) */ + /* Drop the CRC - it's not a good idea to try and negotiate it ;) */ skb_trim(skb, skb->len-2); skb->protocol=__constant_htons(ETH_P_WAN_PPP); skb->mac.raw=skb->data; skb->dev=c->netdevice; /* - * Send it to the PPP layer. We dont have time to process + * Send it to the PPP layer. We don't have time to process * it right now. */ netif_rx(skb); diff -Nru a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c --- a/drivers/net/wan/lmc/lmc_main.c Thu Feb 27 01:44:21 2003 +++ b/drivers/net/wan/lmc/lmc_main.c Thu Feb 27 01:44:21 2003 @@ -1024,7 +1024,7 @@ } -/* This is the entry point. This is what is called immediatly. */ +/* This is the entry point. This is what is called immediately. */ /* This goes out and finds the card */ int lmc_probe_fake(struct net_device *dev) /*fold00*/ @@ -2149,7 +2149,7 @@ /* owned by 21140 */ sc->lmc_rxring[i].status = 0x80000000; - /* used to be PKT_BUF_SZ now uses skb since we loose some to head room */ + /* used to be PKT_BUF_SZ now uses skb since we lose some to head room */ sc->lmc_rxring[i].length = skb->end - skb->data; /* use to be tail which is dumb since you're thinking why write diff -Nru a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c --- a/drivers/net/wan/sbni.c Thu Feb 27 01:44:22 2003 +++ b/drivers/net/wan/sbni.c Thu Feb 27 01:44:22 2003 @@ -684,7 +684,7 @@ /* * if CRC is right but framelen incorrect then transmitter - * error was occured... drop entire packet + * error was occurred... drop entire packet */ else if( (frame_ok = skip_tail( dev->base_addr, framelen, crc )) != 0 ) diff -Nru a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c --- a/drivers/net/wan/sdla_chdlc.c Thu Feb 27 01:44:23 2003 +++ b/drivers/net/wan/sdla_chdlc.c Thu Feb 27 01:44:23 2003 @@ -3529,7 +3529,7 @@ card->devname); }else{ /* IP addresses are the same and the link is up, - * we dont have to do anything here. Therefore, exit */ + * we don't have to do anything here. Therefore, exit */ return 0; } } diff -Nru a/drivers/net/wan/sdla_fr.c b/drivers/net/wan/sdla_fr.c --- a/drivers/net/wan/sdla_fr.c Thu Feb 27 01:44:31 2003 +++ b/drivers/net/wan/sdla_fr.c Thu Feb 27 01:44:31 2003 @@ -107,7 +107,7 @@ * the if clause for it(0,dev->tbusy) * forever. * The code got into this stage due to an -* interrupt occuring within the if clause for +* interrupt occurring within the if clause for * set_bit(0,dev->tbusy). Since an interrupt * disables furhter transmit interrupt and * makes dev->tbusy = 0, this effect was undone @@ -1726,7 +1726,7 @@ /*============================================================================ - * Setup so that a frame can be transmitted on the occurence of a transmit + * Setup so that a frame can be transmitted on the occurrence of a transmit * interrupt. */ static int setup_for_delayed_transmit (netdevice_t* dev, struct sk_buff *skb) @@ -2071,7 +2071,7 @@ ++card->statistics.isr_intr_test; break; - case FR_INTR_DLC: /* Event interrupt occured */ + case FR_INTR_DLC: /* Event interrupt occurred */ mbox->cmd.command = FR_READ_STATUS; mbox->cmd.length = 0; err = sdla_exec(mbox) ? mbox->cmd.result : CMD_TIMEOUT; @@ -2747,7 +2747,7 @@ return 1; } - /* If we get here, its an IPX-data packet so it'll get passed up the + /* If we get here, it's an IPX-data packet so it'll get passed up the * stack. * switch the network numbers */ diff -Nru a/drivers/net/wan/sdla_ppp.c b/drivers/net/wan/sdla_ppp.c --- a/drivers/net/wan/sdla_ppp.c Thu Feb 27 01:44:20 2003 +++ b/drivers/net/wan/sdla_ppp.c Thu Feb 27 01:44:20 2003 @@ -2004,7 +2004,7 @@ (unsigned long)card->u.p.txbuf, *card->u.p.txbuf_next, (unsigned long)card->rxmb, *card->u.p.rxbuf_next); - /* Tell timer interrupt that PPP event occured */ + /* Tell timer interrupt that PPP event occurred */ ppp_priv_area->timer_int_enabled |= TMR_INT_ENABLED_PPP_EVENT; flags->imask |= PPP_INTR_TIMER; @@ -2221,7 +2221,7 @@ return 1; } else { - //If we get here's its an IPX-data packet, so it'll get passed up the stack. + //If we get here it's an IPX-data packet, so it'll get passed up the stack. //switch the network numbers switch_net_numbers(sendpacket, network_number, 1); @@ -3418,7 +3418,7 @@ card->devname); }else{ /* IP addresses are the same and the link is up, - * we dont have to do anything here. Therefore, exit */ + * we don't have to do anything here. Therefore, exit */ return 0; } } diff -Nru a/drivers/net/wan/sdla_x25.c b/drivers/net/wan/sdla_x25.c --- a/drivers/net/wan/sdla_x25.c Thu Feb 27 01:44:26 2003 +++ b/drivers/net/wan/sdla_x25.c Thu Feb 27 01:44:26 2003 @@ -1598,7 +1598,7 @@ } /*============================================================================ - * Setup so that a frame can be transmitted on the occurence of a transmit + * Setup so that a frame can be transmitted on the occurrence of a transmit * interrupt. *===========================================================================*/ @@ -3064,7 +3064,7 @@ /* Bug Fix: Mar 14 2000 * The Protocol violation error conditions were - * not handeled previously */ + * not handled previously */ switch (mb->cmd.pktType & 0x7F){ @@ -3178,7 +3178,7 @@ * when clearing a call because protocol encapsulation is not * supported. * 4. If an incoming call is received while a call request is - * pending (i.e. call collision has occured), the incoming call + * pending (i.e. call collision has occurred), the incoming call * shall be rejected and call request shall be retried. *====================================================================*/ @@ -4088,7 +4088,7 @@ return 1; } else { - /*If we get here its an IPX-data packet, so it'll get passed up the stack. + /*If we get here it's an IPX-data packet, so it'll get passed up the stack. */ /* switch the network numbers */ switch_net_numbers(sendpacket, network_number, 1); diff -Nru a/drivers/net/wan/sdlamain.c b/drivers/net/wan/sdlamain.c --- a/drivers/net/wan/sdlamain.c Thu Feb 27 01:44:27 2003 +++ b/drivers/net/wan/sdlamain.c Thu Feb 27 01:44:27 2003 @@ -38,7 +38,7 @@ * replaced it with 'wandev->enable_tx_int'. * May 29, 1997 Jaspreet Singh Flow Control Problem * added "wandev->tx_int_enabled=1" line in the -* init module. This line intializes the flag for +* init module. This line initializes the flag for * preventing Interrupt disabled with device set to * busy * Jan 15, 1997 Gene Kozin Version 3.1.0 @@ -434,7 +434,7 @@ } /* If the current card has already been configured - * or its a piggyback card, do not try to allocate + * or it's a piggyback card, do not try to allocate * resources. */ if (!card->wandev.piggyback && !card->configured){ diff -Nru a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c --- a/drivers/net/wan/sealevel.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/wan/sealevel.c Thu Feb 27 01:44:25 2003 @@ -56,13 +56,13 @@ static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb) { - /* Drop the CRC - its not a good idea to try and negotiate it ;) */ + /* Drop the CRC - it's not a good idea to try and negotiate it ;) */ skb_trim(skb, skb->len-2); skb->protocol=htons(ETH_P_WAN_PPP); skb->mac.raw=skb->data; skb->dev=c->netdevice; /* - * Send it to the PPP layer. We dont have time to process + * Send it to the PPP layer. We don't have time to process * it right now. */ netif_rx(skb); diff -Nru a/drivers/net/wan/wanpipe_multppp.c b/drivers/net/wan/wanpipe_multppp.c --- a/drivers/net/wan/wanpipe_multppp.c Thu Feb 27 01:44:31 2003 +++ b/drivers/net/wan/wanpipe_multppp.c Thu Feb 27 01:44:31 2003 @@ -2283,7 +2283,7 @@ Intr_test_counter = 0; - /* The critical flag is unset because during intialization (if_open) + /* The critical flag is unset because during initialization (if_open) * we want the interrupts to be enabled so that when the wpc_isr is * called it does not exit due to critical flag set. */ diff -Nru a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c --- a/drivers/net/wan/z85230.c Thu Feb 27 01:44:17 2003 +++ b/drivers/net/wan/z85230.c Thu Feb 27 01:44:17 2003 @@ -1634,7 +1634,7 @@ write_zsreg(c, R0, RES_Rx_CRC); } else - /* Can't occur as we dont reenable the DMA irq until + /* Can't occur as we don't reenable the DMA irq until after the flip is done */ printk(KERN_WARNING "%s: DMA flip overrun!\n", c->netdevice->name); diff -Nru a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig --- a/drivers/net/wireless/Kconfig Thu Feb 27 01:44:20 2003 +++ b/drivers/net/wireless/Kconfig Thu Feb 27 01:44:20 2003 @@ -6,13 +6,13 @@ depends on NETDEVICES config NET_RADIO - bool "Wireless LAN (non-hamradio)" + bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions" ---help--- Support for wireless LANs and everything having to do with radio, but not with amateur radio or FM broadcasting. Saying Y here also enables the Wireless Extensions (creates - /proc/net/wireless and enables ifconfig access). The Wireless + /proc/net/wireless and enables iwconfig access). The Wireless Extension is a generic API allowing a driver to expose to the user space configuration and statistics specific to common Wireless LANs. The beauty of it is that a single set of tool can support all the @@ -28,6 +28,11 @@ special kernel support are available from . +# Note : the cards are obsolete (can't buy them anymore), but the drivers +# are not, as people are still using them... +comment "Obsolete Wireless cards support (pre-802.11)" + depends on NET_RADIO && (INET || ISA || PCMCIA) + config STRIP tristate "STRIP (Metricom starmode radio IP)" depends on NET_RADIO && INET @@ -68,10 +73,6 @@ On some computers the card ends up in non-valid state after some time. Use a ping-reset script to clear it. -comment "Wireless ISA/PCI cards support" - depends on NET_RADIO && (ISA || PCI || ALL_PPC || PCMCIA) - -# Good old obsolete Wavelan. config WAVELAN tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support" depends on NET_RADIO && ISA @@ -102,7 +103,54 @@ module, say M here and read as well as . -# 802.11b cards +config PCMCIA_WAVELAN + tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support" + depends on NET_RADIO && PCMCIA + help + Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA + (PC-card) wireless Ethernet networking card to your computer. This + driver is for the non-IEEE-802.11 Wavelan cards. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called wavelan_cs. If you want to compile it + as a module, say M here and read . + If unsure, say N. + +config PCMCIA_NETWAVE + tristate "Xircom Netwave AirSurfer Pcmcia wireless support" + depends on NET_RADIO && PCMCIA + help + Say Y here if you intend to attach this type of PCMCIA (PC-card) + wireless Ethernet networking card to your computer. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called netwave_cs. If you want to compile it + as a module, say M here and read . + If unsure, say N. + +comment "Wireless 802.11 Frequency Hopping cards support" + depends on NET_RADIO && PCMCIA + +config PCMCIA_RAYCS + tristate "Aviator/Raytheon 2.4MHz wireless support" + depends on NET_RADIO && PCMCIA + ---help--- + Say Y here if you intend to attach an Aviator/Raytheon PCMCIA + (PC-card) wireless Ethernet networking card to your computer. + Please read the file for + details. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called ray_cs. If you want to compile it as a + module, say M here and read . If + unsure, say N. + +comment "Wireless 802.11b ISA/PCI cards support" + depends on NET_RADIO && (ISA || PCI || ALL_PPC || PCMCIA) + config AIRO tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" depends on NET_RADIO && (ISA || PCI) @@ -175,41 +223,12 @@ this variety. # If Pcmcia is compiled in, offer Pcmcia cards... -comment "Wireless Pcmcia/Cardbus cards support" - depends on NET_RADIO && PCMCIA - -# Obsolete cards -config PCMCIA_NETWAVE - tristate "Xircom Netwave AirSurfer Pcmcia wireless support" - depends on NET_RADIO && PCMCIA - help - Say Y here if you intend to attach this type of PCMCIA (PC-card) - wireless Ethernet networking card to your computer. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called netwave_cs. If you want to compile it - as a module, say M here and read . - If unsure, say N. - -config PCMCIA_WAVELAN - tristate "AT&T/Lucent old Wavelan Pcmcia wireless support" +comment "Wireless 802.11b Pcmcia/Cardbus cards support" depends on NET_RADIO && PCMCIA - help - Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA - (PC-card) wireless Ethernet networking card to your computer. This - driver is for the non-IEEE-802.11 Wavelan cards. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called wavelan_cs. If you want to compile it - as a module, say M here and read . - If unsure, say N. - -# 802.11b cards config PCMCIA_HERMES tristate "Hermes PCMCIA card support" - depends on PCMCIA!=n && HERMES + depends on NET_RADIO && PCMCIA && HERMES ---help--- A driver for "Hermes" chipset based PCMCIA wireless adaptors, such as the Lucent WavelanIEEE/Orinoco cards and their OEM (Cabletron/ @@ -248,34 +267,6 @@ Hinds' pcmcia-cs package (see the file for location). You also want to check out the PCMCIA-HOWTO, available from . - -config NET_PCMCIA_RADIO - bool "PCMCIA Wireless LAN" - depends on NET_PCMCIA - help - Say Y here if you would like to use a PCMCIA (PC-card) device to - connect to a wireless local area network. Then say Y to the driver - for your particular card below. - - To use your PC-cards, you will need supporting software from David - Hinds' pcmcia-cs package (see the file - for location). You also want to check out the PCMCIA-HOWTO, - available from . - -config PCMCIA_RAYCS - tristate "Aviator/Raytheon 2.4MHz wireless support" - depends on NET_PCMCIA_RADIO && PCMCIA - ---help--- - Say Y here if you intend to attach an Aviator/Raytheon PCMCIA - (PC-card) wireless Ethernet networking card to your computer. - Please read the file for - details. - - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ray_cs. If you want to compile it as a - module, say M here and read . If - unsure, say N. # yes, this works even when no drivers are selected config NET_WIRELESS diff -Nru a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c --- a/drivers/net/wireless/airo.c Thu Feb 27 01:44:18 2003 +++ b/drivers/net/wireless/airo.c Thu Feb 27 01:44:18 2003 @@ -970,7 +970,7 @@ int open; struct net_device *dev; /* Note, we can have MAX_FIDS outstanding. FIDs are 16-bits, so we - use the high bit to mark wether it is in use. */ + use the high bit to mark whether it is in use. */ #define MAX_FIDS 6 int fids[MAX_FIDS]; int registered; @@ -2213,7 +2213,7 @@ /* Enable the interrupts */ OUT4500( ai, EVINTEN, STATUS_INTS ); /* Note there is a race condition between the last two lines that - I dont know how to get rid of right now... */ + I don't know how to get rid of right now... */ } static void disable_interrupts( struct airo_info *ai ) { @@ -5126,7 +5126,7 @@ Resp rsp; /* Note : you may have realised that, as this is a SET operation, - * this is priviledged and therefore a normal user can't + * this is privileged and therefore a normal user can't * perform scanning. * This is not an error, while the device perform scanning, * traffic doesn't flow, so it's a perfect DoS... diff -Nru a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c --- a/drivers/net/wireless/arlan-proc.c Thu Feb 27 01:44:23 2003 +++ b/drivers/net/wireless/arlan-proc.c Thu Feb 27 01:44:23 2003 @@ -79,7 +79,7 @@ case 0xFB: return "ERROR BackBone failure "; case 0xFA: - return "ERROR tranceiver not found "; + return "ERROR transceiver not found "; case 0xF9: return "ERROR no more address space "; case 0xF8: diff -Nru a/drivers/net/wireless/arlan.c b/drivers/net/wireless/arlan.c --- a/drivers/net/wireless/arlan.c Thu Feb 27 01:44:25 2003 +++ b/drivers/net/wireless/arlan.c Thu Feb 27 01:44:25 2003 @@ -567,7 +567,7 @@ break; times++; } - /* if long command, we wont repeat trying */ ; + /* if long command, we won't repeat trying */ ; if (priv->card_polling_interval > 1) break; times++; diff -Nru a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c --- a/drivers/net/wireless/orinoco.c Thu Feb 27 01:44:31 2003 +++ b/drivers/net/wireless/orinoco.c Thu Feb 27 01:44:31 2003 @@ -117,7 +117,7 @@ * o Init of priv->tx_rate_ctrl in firmware specific section. * o Prism2/Symbol rate, upto should be 0xF and not 0x15. Doh ! * o Spectrum card always need cor_reset (for every reset) - * o Fix cor_reset to not loose bit 7 in the register + * o Fix cor_reset to not lose bit 7 in the register * o flush_stale_links to remove zombie Pcmcia instances * o Ack previous hermes event before reset * Me (with my little hands) @@ -4166,7 +4166,7 @@ e = create_proc_read_entry("buf", S_IFREG | S_IRUGO, priv->dir_dev, orinoco_proc_get_hermes_buf, priv); if (! e) { - printk(KERN_ERR "Unable to intialize /proc/hermes/%s/buf\n", dev->name); + printk(KERN_ERR "Unable to initialize /proc/hermes/%s/buf\n", dev->name); goto fail; } diff -Nru a/drivers/net/wireless/todo.txt b/drivers/net/wireless/todo.txt --- a/drivers/net/wireless/todo.txt Thu Feb 27 01:44:26 2003 +++ b/drivers/net/wireless/todo.txt Thu Feb 27 01:44:26 2003 @@ -2,28 +2,14 @@ ------------- 1) Bring other kernel Wireless LAN drivers here - Already done : - o hermes.c/orinoco.c -> Wavelan IEEE driver + Airport driver - o airo.c/airo_cs.c -> Ben's Aironet driver - o wavelan.c -> old Wavelan ISA driver - o wavelan_cs.c -> old Wavelan Pcmcia driver - o netwave_cs.c -> Netwave Pcmcia driver - Drivers likely to go : - o ray_cs.c -> Raytheon/Aviator driver (maintainer MIA) - Drivers I have absolutely no control over : - o arlan.c -> old Aironet Arlan 655 (need to ask Elmer) - o aironet4500_xxx.c -> Elmer's Aironet driver (need to ask Elmer) - o strip.c -> Metricom's stuff. Not a wlan. Hum... - - ETA : Kernel 2.5.X + Completed 2) Bring new Wireless LAN driver not yet in the kernel there See my web page for details + In particular : HostAP 3) Misc o Mark wavelan, wavelan_cs, netwave_cs drivers as obsolete o Maybe arlan.c, ray_cs.c and strip.c also deserve to be obsolete - o Use new Probe/module stuff in wavelan.c - o New Wireless Extension API (pending) Jean II diff -Nru a/drivers/net/wireless/wavelan_cs.h b/drivers/net/wireless/wavelan_cs.h --- a/drivers/net/wireless/wavelan_cs.h Thu Feb 27 01:44:25 2003 +++ b/drivers/net/wireless/wavelan_cs.h Thu Feb 27 01:44:25 2003 @@ -60,7 +60,7 @@ /* The detection of the wavelan card is made by reading the MAC address * from the card and checking it. If you have a non AT&T product (OEM, * like DEC RoamAbout, or Digital Ocean, Epson, ...), you must modify this - * part to accomodate your hardware... + * part to accommodate your hardware... */ const unsigned char MAC_ADDRESSES[][3] = { diff -Nru a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c --- a/drivers/parisc/ccio-dma.c Thu Feb 27 01:44:19 2003 +++ b/drivers/parisc/ccio-dma.c Thu Feb 27 01:44:19 2003 @@ -924,7 +924,7 @@ ** can't change. And we need the offset from the first ** chunk - not the last one. Ergo Successive chunks ** must start on page boundaries and dove tail - ** with it's predecessor. + ** with its predecessor. */ sg_dma_len(vcontig_sg) = vcontig_len; diff -Nru a/drivers/parisc/dino.c b/drivers/parisc/dino.c --- a/drivers/parisc/dino.c Thu Feb 27 01:44:17 2003 +++ b/drivers/parisc/dino.c Thu Feb 27 01:44:17 2003 @@ -755,7 +755,7 @@ /* ** This enables DINO to generate interrupts when it sees - ** any of it's inputs *change*. Just asserting an IRQ + ** any of its inputs *change*. Just asserting an IRQ ** before it's enabled (ie unmasked) isn't good enough. */ gsc_writel(eim, dino_dev->hba.base_addr+DINO_IAR0); diff -Nru a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c --- a/drivers/parisc/sba_iommu.c Thu Feb 27 01:44:27 2003 +++ b/drivers/parisc/sba_iommu.c Thu Feb 27 01:44:27 2003 @@ -1114,7 +1114,7 @@ /* ** Two address ranges are DMA contiguous *iff* "end of prev" and -** "start of next" are both on a page boundry. +** "start of next" are both on a page boundary. ** ** (shift left is a quick trick to mask off upper bits) */ @@ -1219,7 +1219,7 @@ ** can't change. And we need the offset from the first ** chunk - not the last one. Ergo Successive chunks ** must start on page boundaries and dove tail - ** with it's predecessor. + ** with its predecessor. */ sg_dma_len(vcontig_sg) = vcontig_len; diff -Nru a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c --- a/drivers/parport/parport_pc.c Thu Feb 27 01:44:30 2003 +++ b/drivers/parport/parport_pc.c Thu Feb 27 01:44:30 2003 @@ -35,7 +35,7 @@ * All registers are 8 bits wide and read/write. If your hardware differs * only in register addresses (eg because your registers are on 32-bit * word boundaries) then you can alter the constants in parport_pc.h to - * accomodate this. + * accommodate this. * * Note that the ECP registers may not start at offset 0x400 for PCI cards, * but rather will start at port->base_hi. @@ -422,7 +422,7 @@ status = inb (STATUS (port)); if (status & 0x01) { /* EPP timeout should never occur... */ - printk (KERN_DEBUG "%s: EPP timeout occured while talking to " + printk (KERN_DEBUG "%s: EPP timeout occurred while talking to " "w91284pic (should not have done)\n", port->name); clear_epp_timeout (port); } diff -Nru a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c --- a/drivers/pcmcia/i82365.c Thu Feb 27 01:44:28 2003 +++ b/drivers/pcmcia/i82365.c Thu Feb 27 01:44:28 2003 @@ -846,7 +846,7 @@ printk("PNP "); - if (pnp_activate_dev(dev, NULL) < 0) { + if (pnp_activate_dev(dev) < 0) { printk("activate failed\n"); pnp_device_detach(dev); break; diff -Nru a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c --- a/drivers/s390/block/dasd.c Thu Feb 27 01:44:22 2003 +++ b/drivers/s390/block/dasd.c Thu Feb 27 01:44:22 2003 @@ -1582,7 +1582,7 @@ /* * Cancels a request that was started with dasd_sleep_on_req. - * This is usefull to timeout requests. The request will be + * This is useful to timeout requests. The request will be * terminated if it is currently in i/o. * Returns 1 if the request has been terminated. */ diff -Nru a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c --- a/drivers/s390/block/dasd_3990_erp.c Thu Feb 27 01:44:27 2003 +++ b/drivers/s390/block/dasd_3990_erp.c Thu Feb 27 01:44:27 2003 @@ -197,7 +197,7 @@ * DASD_3990_ERP_CLEANUP * * DESCRIPTION - * Removes the already build but not neccessary ERP request and sets + * Removes the already build but not necessary ERP request and sets * the status of the original cqr / erp to the given (final) status * * PARAMETER diff -Nru a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c --- a/drivers/s390/block/dasd_diag.c Thu Feb 27 01:44:17 2003 +++ b/drivers/s390/block/dasd_diag.c Thu Feb 27 01:44:17 2003 @@ -467,7 +467,7 @@ * the diag_bio_t for each block has 16 bytes. * That makes: * (8192 - 96 - 8) / 16 = 505.5 blocks at maximum. - * We want to fit two into the available memory so that we can immediatly + * We want to fit two into the available memory so that we can immediately * start the next request if one finishes off. That makes 252.75 blocks * for one request. Give a little safety and the result is 240. */ diff -Nru a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c --- a/drivers/s390/block/dasd_eckd.c Thu Feb 27 01:44:16 2003 +++ b/drivers/s390/block/dasd_eckd.c Thu Feb 27 01:44:16 2003 @@ -1427,7 +1427,7 @@ * addition we have one define extent ccw + 16 bytes of data and one * locate record ccw + 16 bytes of data. That makes: * (8192 - 24 - 136 - 8 - 16 - 8 - 16) / 16 = 499 blocks at maximum. - * We want to fit two into the available memory so that we can immediatly + * We want to fit two into the available memory so that we can immediately * start the next request if one finishes off. That makes 249.5 blocks * for one request. Give a little safety and the result is 240. */ diff -Nru a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c --- a/drivers/s390/block/dasd_fba.c Thu Feb 27 01:44:26 2003 +++ b/drivers/s390/block/dasd_fba.c Thu Feb 27 01:44:26 2003 @@ -389,7 +389,7 @@ * locate record ccw for each block (stupid devices!) + 16 bytes of data. * That makes: * (8192 - 24 - 136 - 8 - 16) / 40 = 200.2 blocks at maximum. - * We want to fit two into the available memory so that we can immediatly + * We want to fit two into the available memory so that we can immediately * start the next request if one finishes off. That makes 100.1 blocks * for one request. Give a little safety and the result is 96. */ diff -Nru a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c --- a/drivers/s390/char/con3215.c Thu Feb 27 01:44:26 2003 +++ b/drivers/s390/char/con3215.c Thu Feb 27 01:44:26 2003 @@ -312,10 +312,10 @@ } /* - * Function to conditionally start an IO. A read is started immediatly, - * a write is only started immediatly if the flush flag is on or the + * Function to conditionally start an IO. A read is started immediately, + * a write is only started immediately if the flush flag is on or the * amount of data is bigger than RAW3215_MIN_WRITE. If a write is not - * done immediatly a timer is started with a delay of RAW3215_TIMEOUT. + * done immediately a timer is started with a delay of RAW3215_TIMEOUT. */ static inline void raw3215_try_io(struct raw3215_info *raw) diff -Nru a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c --- a/drivers/s390/char/sclp.c Thu Feb 27 01:44:25 2003 +++ b/drivers/s390/char/sclp.c Thu Feb 27 01:44:25 2003 @@ -26,7 +26,7 @@ #define SCLP_CORE_PRINT_HEADER "sclp low level driver: " /* - * decides wether we make use of the macro MACHINE_IS_VM to + * decides whether we make use of the macro MACHINE_IS_VM to * configure the driver for VM at run time (a little bit * different behaviour); otherwise we use the default * settings in sclp_data.init_ioctls diff -Nru a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c --- a/drivers/s390/char/sclp_rw.c Thu Feb 27 01:44:22 2003 +++ b/drivers/s390/char/sclp_rw.c Thu Feb 27 01:44:22 2003 @@ -192,7 +192,7 @@ * under VM (Why does VM interpret \n but the native machine doesn't ?) * * Depending on i/o-control setting the message is always written - * immediatly or we wait for a final new line maybe coming with the + * immediately or we wait for a final new line maybe coming with the * next message. Besides we avoid a buffer overrun by writing its * content. * diff -Nru a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c --- a/drivers/s390/cio/device_fsm.c Thu Feb 27 01:44:23 2003 +++ b/drivers/s390/cio/device_fsm.c Thu Feb 27 01:44:23 2003 @@ -288,7 +288,7 @@ } /* Is Set Path Group supported? */ if (!cdev->private->flags.pgid_supp) { - /* No, set state online immediatly. */ + /* No, set state online immediately. */ ccw_device_done(cdev, DEV_STATE_ONLINE); return 0; } @@ -333,7 +333,7 @@ return -EBUSY; /* Is Set Path Group supported? */ if (!cdev->private->flags.pgid_supp) { - /* No, set state offline immediatly. */ + /* No, set state offline immediately. */ ccw_device_done(cdev, DEV_STATE_OFFLINE); return 0; } diff -Nru a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h --- a/drivers/s390/cio/qdio.h Thu Feb 27 01:44:20 2003 +++ b/drivers/s390/cio/qdio.h Thu Feb 27 01:44:20 2003 @@ -27,7 +27,7 @@ #define IQDIO_DELAY_TARGET 0 #define QDIO_BUSY_BIT_PATIENCE 2000 /* in microsecs */ #define IQDIO_GLOBAL_LAPS 2 /* GLOBAL_LAPS are not used as we */ -#define IQDIO_GLOBAL_LAPS_INT 1 /* dont global summary */ +#define IQDIO_GLOBAL_LAPS_INT 1 /* don't global summary */ #define IQDIO_LOCAL_LAPS 4 #define IQDIO_LOCAL_LAPS_INT 1 #define IQDIO_GLOBAL_SUMMARY_CC_MASK 2 diff -Nru a/drivers/s390/net/iucv.h b/drivers/s390/net/iucv.h --- a/drivers/s390/net/iucv.h Thu Feb 27 01:44:31 2003 +++ b/drivers/s390/net/iucv.h Thu Feb 27 01:44:31 2003 @@ -214,7 +214,7 @@ * pgm_data- application data passed to interrupt handlers * Output: NA * Return: address of handler - * (0) - Error occured, registration not completed. + * (0) - Error occurred, registration not completed. * NOTE: Exact cause of failure will be recorded in syslog. */ iucv_handle_t iucv_register_program (uchar pgmname[16], diff -Nru a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c --- a/drivers/s390/net/lcs.c Thu Feb 27 01:44:18 2003 +++ b/drivers/s390/net/lcs.c Thu Feb 27 01:44:18 2003 @@ -1206,7 +1206,7 @@ card->stats.tx_packets++; dev_kfree_skb(skb); if (card->tx_emitted <= 0) - /* If this is the first tx buffer emit it immediatly. */ + /* If this is the first tx buffer emit it immediately. */ __lcs_emit_txbuffer(card); return 0; } diff -Nru a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c --- a/drivers/sbus/char/envctrl.c Thu Feb 27 01:44:19 2003 +++ b/drivers/sbus/char/envctrl.c Thu Feb 27 01:44:19 2003 @@ -810,7 +810,7 @@ pchild->fan_mask |= chnls_mask[(pchild->chnl_array[i]).chnl_no]; /* We only need to know if this child has fan status monitored. - * We dont care which channels since we have the mask already. + * We don't care which channels since we have the mask already. */ pchild->mon_type[0] = ENVCTRL_FANSTAT_MON; } @@ -842,7 +842,7 @@ } /* We only need to know if this child has global addressing - * line monitored. We dont care which channels since we know + * line monitored. We don't care which channels since we know * the mask already (ENVCTRL_GLOBALADDR_ADDR_MASK). */ pchild->mon_type[0] = ENVCTRL_GLOBALADDR_MON; @@ -858,7 +858,7 @@ pchild->voltage_mask |= chnls_mask[(pchild->chnl_array[i]).chnl_no]; /* We only need to know if this child has voltage status monitored. - * We dont care which channels since we have the mask already. + * We don't care which channels since we have the mask already. */ pchild->mon_type[0] = ENVCTRL_VOLTAGESTAT_MON; } @@ -1115,7 +1115,7 @@ envctrl_dev.minor); } - /* Note above traversal routine post-incremented 'i' to accomodate + /* Note above traversal routine post-incremented 'i' to accommodate * a next child device, so we decrement before reverse-traversal of * child devices. */ diff -Nru a/drivers/scsi/AM53C974.c b/drivers/scsi/AM53C974.c --- a/drivers/scsi/AM53C974.c Thu Feb 27 01:44:23 2003 +++ b/drivers/scsi/AM53C974.c Thu Feb 27 01:44:23 2003 @@ -2091,7 +2091,7 @@ goto EXIT_ABORT; } msg[0] = AM53C974_read_8(FFREG); - if (!msg[0] & 0x80) { + if (!(msg[0] & 0x80)) { printk("scsi%d: error: expecting IDENTIFY message, got ", instance->host_no); print_msg(msg); hostdata->aborted = 1; diff -Nru a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c --- a/drivers/scsi/FlashPoint.c Thu Feb 27 01:44:20 2003 +++ b/drivers/scsi/FlashPoint.c Thu Feb 27 01:44:20 2003 @@ -3846,7 +3846,7 @@ } else { - if(!currTar_Info->TarEEValue & EE_WIDE_SCSI) + if(!(currTar_Info->TarEEValue & EE_WIDE_SCSI)) { return(0); } @@ -7529,7 +7529,7 @@ * * $Workfile: phase.c $ * - * Description: Functions to intially handle the SCSI bus phase when + * Description: Functions to initially handle the SCSI bus phase when * the target asserts request (and the automation is not * enabled to handle the situation). * @@ -10866,7 +10866,7 @@ * Function: DiagEEPROM * * Description: Verfiy checksum and 'Key' and initialize the EEPROM if - * neccessary. + * necessary. * *---------------------------------------------------------------------*/ diff -Nru a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig --- a/drivers/scsi/Kconfig Thu Feb 27 01:44:30 2003 +++ b/drivers/scsi/Kconfig Thu Feb 27 01:44:30 2003 @@ -1325,9 +1325,9 @@ bool "Include loadable firmware in driver" depends on SCSI_QLOGIC_FC help - Say Y to include ISP2100 Fabric Initiator/Target Firmware, with + Say Y to include ISP2X00 Fabric Initiator/Target Firmware, with expanded LUN addressing and FcTape (FCP-2) support, in the - Qlogic QLA 1280 driver. This is required on some platforms. + qlogicfc driver. This is required on some platforms. config SCSI_QLOGIC_1280 tristate "Qlogic QLA 1280 SCSI support" diff -Nru a/drivers/scsi/Makefile b/drivers/scsi/Makefile --- a/drivers/scsi/Makefile Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/Makefile Thu Feb 27 01:44:27 2003 @@ -120,13 +120,11 @@ obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o obj-$(CONFIG_CHR_DEV_SG) += sg.o -scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \ - scsi_error.o scsi_lib.o scsi_scan.o scsi_syms.o \ - scsi_sysfs.o - -ifdef CONFIG_PROC_FS -scsi_mod-objs += scsi_proc.o -endif +scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ + scsicam.o scsi_error.o scsi_lib.o \ + scsi_scan.o scsi_syms.o scsi_sysfs.o +scsi_mod-$(CONFIG_PROC_FS) += scsi_proc.o +scsi_mod-$(CONFIG_X86_PC9800) += scsi_pc98.o sd_mod-objs := sd.o sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o diff -Nru a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c --- a/drivers/scsi/NCR5380.c Thu Feb 27 01:44:20 2003 +++ b/drivers/scsi/NCR5380.c Thu Feb 27 01:44:20 2003 @@ -2750,7 +2750,7 @@ phase = PHASE_MSGIN; NCR5380_transfer_pio(instance, &phase, &len, &data); - if (!msg[0] & 0x80) { + if (!(msg[0] & 0x80)) { printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no); print_msg(msg); abort = 1; diff -Nru a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c --- a/drivers/scsi/NCR53C9x.c Thu Feb 27 01:44:20 2003 +++ b/drivers/scsi/NCR53C9x.c Thu Feb 27 01:44:20 2003 @@ -2942,7 +2942,7 @@ /* Target negotiates for synchronous transfers before we do, this * is legal although very strange. What is even funnier is that * the SCSI2 standard specifically recommends against targets doing - * this because so many initiators cannot cope with this occuring. + * this because so many initiators cannot cope with this occurring. */ static int target_with_ants_in_pants(struct NCR_ESP *esp, Scsi_Cmnd *SCptr, diff -Nru a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c --- a/drivers/scsi/NCR53c406a.c Thu Feb 27 01:44:23 2003 +++ b/drivers/scsi/NCR53c406a.c Thu Feb 27 01:44:23 2003 @@ -472,7 +472,7 @@ return 0; } - DEB(printk("NCR53c406a BIOS found at %X\n", (unsigned int) bios_base); + DEB(printk("NCR53c406a BIOS found at 0x%x\n", (unsigned int) bios_base); ); #endif /* USE_BIOS */ @@ -487,14 +487,14 @@ } else { for (i = 0; i < PORT_COUNT && !port_base; i++) { if (!request_region(ports[i], 0x10, "NCR53c406a")) { - DEB(printk("NCR53c406a: port %x in use\n", ports[i])); + DEB(printk("NCR53c406a: port 0x%x in use\n", ports[i])); } else { - VDEB(printk("NCR53c406a: port %x available\n", ports[i])); + VDEB(printk("NCR53c406a: port 0x%x available\n", ports[i])); outb(C5_IMG, ports[i] + 0x0d); /* reg set 1 */ if ((inb(ports[i] + 0x0e) ^ inb(ports[i] + 0x0e)) == 7 && (inb(ports[i] + 0x0e) ^ inb(ports[i] + 0x0e)) == 7 && (inb(ports[i] + 0x0e) & 0xf8) == 0x58) { port_base = ports[i]; VDEB(printk("NCR53c406a: Sig register valid\n")); - VDEB(printk("port_base=%x\n", port_base)); + VDEB(printk("port_base=0x%x\n", port_base)); break; } release_region(ports[i], 0x10); @@ -523,7 +523,7 @@ } #endif - DEB(printk("NCR53c406a: using port_base %x\n", port_base)); + DEB(printk("NCR53c406a: using port_base 0x%x\n", port_base)); tpnt->present = 1; tpnt->proc_name = "NCR53c406a"; @@ -611,11 +611,11 @@ for (i = 0; i < PORT_COUNT && !port_base; i++) if (ports[i] == ints[1]) { port_base = ints[1]; - DEB(printk("NCR53c406a: Specified port_base 0x%X\n", port_base); + DEB(printk("NCR53c406a: Specified port_base 0x%x\n", port_base); ) } if (!port_base) { - printk("NCR53c406a: Invalid PORTBASE 0x%X specified\n", ints[1]); + printk("NCR53c406a: Invalid PORTBASE 0x%x specified\n", ints[1]); return; } @@ -638,7 +638,7 @@ if (ints[0] > 2) fast_pio = ints[3]; - DEB(printk("NCR53c406a: port_base=0x%X, irq=%d, fast_pio=%d\n", port_base, irq_level, fast_pio);) + DEB(printk("NCR53c406a: port_base=0x%x, irq=%d, fast_pio=%d\n", port_base, irq_level, fast_pio);) } __setup("ncr53c406a=", NCR53c406a_setup); diff -Nru a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c --- a/drivers/scsi/aacraid/comminit.c Thu Feb 27 01:44:17 2003 +++ b/drivers/scsi/aacraid/comminit.c Thu Feb 27 01:44:17 2003 @@ -210,7 +210,7 @@ /** * aac_comm_init - Initialise FSA data structures - * @dev: Adapter to intialise + * @dev: Adapter to initialise * * Initializes the data structures that are required for the FSA commuication * interface to operate. diff -Nru a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c --- a/drivers/scsi/aacraid/commsup.c Thu Feb 27 01:44:26 2003 +++ b/drivers/scsi/aacraid/commsup.c Thu Feb 27 01:44:26 2003 @@ -79,7 +79,7 @@ * fib_setup - setup the fibs * @dev: Adapter to set up * - * Allocate the PCI space for the fibs, map it and then intialise the + * Allocate the PCI space for the fibs, map it and then initialise the * fib area, the unmapped fib data and also the free list */ diff -Nru a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c --- a/drivers/scsi/aacraid/linit.c Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/aacraid/linit.c Thu Feb 27 01:44:22 2003 @@ -60,7 +60,7 @@ #define AAC_DRIVERNAME "aacraid" MODULE_AUTHOR("Red Hat Inc and Adaptec"); -MODULE_DESCRIPTION("Supports Dell PERC2, 2/Si, 3/Si, 3/Di, Adaptec 2120S, 2200S, 5400S, and HP NetRAID-4M devices. http://domsch.com/linux/ or http://linux.adaptec.com"); +MODULE_DESCRIPTION("Supports Dell PERC2, 2/Si, 3/Si, 3/Di, PERC 320/DC, Adaptec 2120S, 2200S, 5400S, and HP NetRAID-4M devices. http://domsch.com/linux/ or http://linux.adaptec.com"); MODULE_LICENSE("GPL"); MODULE_PARM(nondasd, "i"); MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on"); @@ -96,6 +96,7 @@ { 0x9005, 0x0285, 0x9005, 0x0286, aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1 }, /* Adaptec 2120S (Crusader)*/ { 0x9005, 0x0285, 0x9005, 0x0285, aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2 }, /* Adaptec 2200S (Vulcan)*/ { 0x9005, 0x0285, 0x9005, 0x0287, aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2 }, /* Adaptec 2200S (Vulcan-2m)*/ + { 0x9005, 0x0285, 0x1028, 0x0287, aac_rx_init, "percraid", "DELL ", "PERCRAID ", 2 }, /* Dell PERC 320/DC */ { 0x1011, 0x0046, 0x9005, 0x0365, aac_sa_init, "aacraid", "ADAPTEC ", "Adaptec 5400S ", 4 }, /* Adaptec 5400S (Mustang)*/ { 0x1011, 0x0046, 0x9005, 0x0364, aac_sa_init, "aacraid", "ADAPTEC ", "AAC-364 ", 4 }, /* Adaptec 5400S (Mustang)*/ { 0x1011, 0x0046, 0x9005, 0x1364, aac_sa_init, "percraid", "DELL ", "PERCRAID ", 4 }, /* Dell PERC2 "Quad Channel" */ @@ -110,10 +111,10 @@ static int aac_cfg_release(struct inode * inode,struct file * file); static struct file_operations aac_cfg_fops = { - owner: THIS_MODULE, - ioctl: aac_cfg_ioctl, - open: aac_cfg_open, - release: aac_cfg_release + .owner = THIS_MODULE, + .ioctl = aac_cfg_ioctl, + .open = aac_cfg_open, + .release = aac_cfg_release }; static int aac_detect(Scsi_Host_Template *); diff -Nru a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c --- a/drivers/scsi/aha152x.c Thu Feb 27 01:44:17 2003 +++ b/drivers/scsi/aha152x.c Thu Feb 27 01:44:17 2003 @@ -1131,7 +1131,7 @@ while ( setup_countSCp.this_residual = CURRENT_SC->SCp.buffer->length; } - the_time=jiffies + 10*HZ; + the_time=jiffies + 100*HZ; while(TESTLO(DMASTAT, DFIFOEMP|INTSTAT) && time_before(jiffies,the_time)) barrier(); diff -Nru a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c --- a/drivers/scsi/aha1542.c Thu Feb 27 01:44:23 2003 +++ b/drivers/scsi/aha1542.c Thu Feb 27 01:44:23 2003 @@ -1161,7 +1161,7 @@ if(pnp_device_attach(pdev)<0) continue; - if(pnp_activate_dev(pdev, NULL)<0) { + if(pnp_activate_dev(pdev)<0) { pnp_device_detach(pdev); continue; } diff -Nru a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h --- a/drivers/scsi/aic7xxx/aic79xx.h Thu Feb 27 01:44:26 2003 +++ b/drivers/scsi/aic7xxx/aic79xx.h Thu Feb 27 01:44:26 2003 @@ -180,7 +180,7 @@ /* * Define the size of our QIN and QOUT FIFOs. They must be a power of 2 - * in size and accomodate as many transactions as can be queued concurrently. + * in size and accommodate as many transactions as can be queued concurrently. */ #define AHD_QIN_SIZE AHD_MAX_QUEUE #define AHD_QOUT_SIZE AHD_MAX_QUEUE @@ -365,7 +365,7 @@ /* * The driver keeps up to MAX_SCB scb structures per card in memory. The SCB - * consists of a "hardware SCB" mirroring the fields availible on the card + * consists of a "hardware SCB" mirroring the fields available on the card * and additional information the kernel stores for each transaction. * * To minimize space utilization, a portion of the hardware scb stores diff -Nru a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c --- a/drivers/scsi/aic7xxx/aic79xx_core.c Thu Feb 27 01:44:16 2003 +++ b/drivers/scsi/aic7xxx/aic79xx_core.c Thu Feb 27 01:44:16 2003 @@ -516,7 +516,7 @@ ahd_dump_card_state(ahd); panic("BRKADRINT"); - /* Tell everyone that this HBA is no longer availible */ + /* Tell everyone that this HBA is no longer available */ ahd_abort_scbs(ahd, CAM_TARGET_WILDCARD, ALL_CHANNELS, CAM_LUN_WILDCARD, SCB_LIST_NULL, ROLE_UNKNOWN, CAM_NO_HBA); @@ -3755,9 +3755,9 @@ devinfo->target, &tstate); /* - * Parse as much of the message as is availible, + * Parse as much of the message as is available, * rejecting it if we don't support it. When - * the entire message is availible and has been + * the entire message is available and has been * handled, return MSGLOOP_MSGCOMPLETE, indicating * that we have parsed an entire message. * @@ -6016,7 +6016,7 @@ * Now that termination is set, wait for up * to 500ms for our transceivers to settle. If * the adapter does not have a cable attached, - * the tranceivers may never settle, so don't + * the transceivers may never settle, so don't * complain if we fail here. */ for (wait = 10000; diff -Nru a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c --- a/drivers/scsi/aic7xxx/aic79xx_osm.c Thu Feb 27 01:44:24 2003 +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c Thu Feb 27 01:44:24 2003 @@ -801,7 +801,6 @@ /************************ Host template entry points *************************/ static int ahd_linux_detect(Scsi_Host_Template *); -static int ahd_linux_release(struct Scsi_Host *); static const char *ahd_linux_info(struct Scsi_Host *); static int ahd_linux_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *)); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) @@ -811,6 +810,7 @@ static int ahd_linux_biosparam(struct scsi_device*, struct block_device*, sector_t, int[]); #else +static int ahd_linux_release(struct Scsi_Host *); static void ahd_linux_select_queue_depth(struct Scsi_Host *host, Scsi_Device *scsi_devs); static int ahd_linux_biosparam(Disk *, kdev_t, int[]); @@ -874,7 +874,7 @@ ahd_list_lockinit(); #ifdef CONFIG_PCI - ahd_linux_pci_probe(template); + ahd_linux_pci_init(); #endif /* @@ -894,6 +894,7 @@ return (found); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) /* * Free the passed in Scsi_Host memory structures prior to unloading the * module. @@ -925,6 +926,7 @@ ahd_list_unlock(&l); return (0); } +#endif /* * Return a string describing the driver. @@ -1664,9 +1666,9 @@ } Scsi_Host_Template aic79xx_driver_template = { + .module = THIS_MODULE, + .name = "aic79xx", .proc_info = ahd_linux_proc_info, - .detect = ahd_linux_detect, - .release = ahd_linux_release, .info = ahd_linux_info, .queuecommand = ahd_linux_queue, .eh_abort_handler = ahd_linux_abort, @@ -1698,18 +1700,17 @@ #endif #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - .name = "aic79xx", .slave_alloc = ahd_linux_slave_alloc, .slave_configure = ahd_linux_slave_configure, .slave_destroy = ahd_linux_slave_destroy, #else + .detect = ahd_linux_detect, + .release = ahd_linux_release, .select_queue_depths = ahd_linux_select_queue_depth, .use_new_eh_code = 1, #endif }; -#define driver_template aic79xx_driver_template -#include "scsi_module.c" /**************************** Tasklet Handler *********************************/ static void @@ -2381,9 +2382,8 @@ ahd_set_name(ahd, new_name); } host->unique_id = ahd->unit; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - scsi_set_device(host, &ahd->dev_softc->dev); -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,4) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,4) && \ + LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) scsi_set_pci_device(host, ahd->dev_softc); #endif ahd_linux_initialize_scsi_bus(ahd); @@ -2410,6 +2410,10 @@ ahd_intr_enable(ahd, TRUE); ahd_linux_start_dv(ahd); ahd_unlock(ahd, &s); + +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + scsi_add_host(host, &ahd->dev_softc->dev); +#endif return (0); } @@ -2556,8 +2560,12 @@ __WCLONE) == -ERESTARTSYS); } ahd_teardown_runq_tasklet(ahd); - if (ahd->platform_data->host != NULL) + if (ahd->platform_data->host != NULL) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + scsi_remove_host(ahd->platform_data->host); +#endif scsi_unregister(ahd->platform_data->host); + } /* destroy all of the device and target objects */ for (i = 0; i < AHD_NUM_TARGETS; i++) { @@ -2595,21 +2603,17 @@ 0x1000); #endif } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - /* XXX Need an instance detach in the PCI code */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) && \ + LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) + /* + * In 2.4 we detach from the scsi midlayer before the PCI + * layer invokes our remove callback. + */ if (ahd->dev_softc != NULL) ahd->dev_softc->driver = NULL; #endif free(ahd->platform_data, M_DEVBUF); } - if (TAILQ_EMPTY(&ahd_tailq)) { - unregister_reboot_notifier(&ahd_linux_notifier); -#ifdef CONFIG_PCI -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - pci_unregister_driver(&aic79xx_pci_driver); -#endif -#endif - } } void @@ -5315,3 +5319,30 @@ } } } + +static int __init ahd_linux_init(void) +{ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + return (ahd_linux_detect(&aic79xx_driver_template) ? 0 : -ENODEV); +#else + scsi_register_module(MODULE_SCSI_HA, &aic79xx_driver_template); + if (!driver_template.present) { + scsi_unregister_module(MODULE_SCSI_HA, + &aic79xx_driver_template); + return (-ENODEV); + } + + return (0); +#endif +} + +static void __exit ahd_linux_exit(void) +{ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) + scsi_unregister_module(MODULE_SCSI_HA, &aic79xx_driver_template); +#endif + ahd_linux_pci_exit(); +} + +module_init(ahd_linux_init); +module_exit(ahd_linux_exit); diff -Nru a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h --- a/drivers/scsi/aic7xxx/aic79xx_osm.h Thu Feb 27 01:44:25 2003 +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h Thu Feb 27 01:44:25 2003 @@ -952,7 +952,8 @@ #include #endif -int ahd_linux_pci_probe(Scsi_Host_Template *); +int ahd_linux_pci_init(void); +void ahd_linux_pci_exit(void); int ahd_pci_map_registers(struct ahd_softc *ahd); int ahd_pci_map_int(struct ahd_softc *ahd); diff -Nru a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c Thu Feb 27 01:44:21 2003 +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c Thu Feb 27 01:44:21 2003 @@ -183,14 +183,21 @@ } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) pci_set_drvdata(pdev, ahd); - if (aic79xx_detect_complete) + if (aic79xx_detect_complete) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) ahd_linux_register_host(ahd, &aic79xx_driver_template); +#else + printf("aic79xx: ignoring PCI device found after " + "initialization\n"); + return (-ENODEV); +#endif + } #endif return (0); } int -ahd_linux_pci_probe(Scsi_Host_Template *template) +ahd_linux_pci_init(void) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) return (pci_module_init(&aic79xx_pci_driver)); @@ -217,6 +224,12 @@ } return (found); #endif +} + +void +ahd_linux_pci_exit(void) +{ + pci_unregister_driver(&aic79xx_pci_driver); } static int diff -Nru a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h --- a/drivers/scsi/aic7xxx/aic7xxx.h Thu Feb 27 01:44:23 2003 +++ b/drivers/scsi/aic7xxx/aic7xxx.h Thu Feb 27 01:44:23 2003 @@ -372,7 +372,7 @@ /* * The driver keeps up to MAX_SCB scb structures per card in memory. The SCB - * consists of a "hardware SCB" mirroring the fields availible on the card + * consists of a "hardware SCB" mirroring the fields available on the card * and additional information the kernel stores for each transaction. * * To minimize space utilization, a portion of the hardware scb stores diff -Nru a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c --- a/drivers/scsi/aic7xxx/aic7xxx_core.c Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/aic7xxx/aic7xxx_core.c Thu Feb 27 01:44:22 2003 @@ -389,7 +389,7 @@ ahc_dump_card_state(ahc); - /* Tell everyone that this HBA is no longer availible */ + /* Tell everyone that this HBA is no longer available */ ahc_abort_scbs(ahc, CAM_TARGET_WILDCARD, ALL_CHANNELS, CAM_LUN_WILDCARD, SCB_LIST_NULL, ROLE_UNKNOWN, CAM_NO_HBA); @@ -2988,9 +2988,9 @@ targ_scsirate = tinfo->scsirate; /* - * Parse as much of the message as is availible, + * Parse as much of the message as is available, * rejecting it if we don't support it. When - * the entire message is availible and has been + * the entire message is available and has been * handled, return MSGLOOP_MSGCOMPLETE, indicating * that we have parsed an entire message. * @@ -4999,7 +4999,7 @@ /* * Wait for up to 500ms for our transceivers * to settle. If the adapter does not have - * a cable attached, the tranceivers may + * a cable attached, the transceivers may * never settle, so don't complain if we * fail here. */ diff -Nru a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c Thu Feb 27 01:44:18 2003 +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c Thu Feb 27 01:44:18 2003 @@ -108,7 +108,7 @@ * but are not limited to: * * 1: Import of the latest FreeBSD sequencer code for this driver - * 2: Modification of kernel code to accomodate different sequencer semantics + * 2: Modification of kernel code to accommodate different sequencer semantics * 3: Extensive changes throughout kernel portion of driver to improve * abort/reset processing and error hanndling * 4: Other work contributed by various people on the Internet @@ -875,7 +875,7 @@ ahc_list_lockinit(); #ifdef CONFIG_PCI - ahc_linux_pci_probe(template); + ahc_linux_pci_init(); #endif if (aic7xxx_no_probe == 0) @@ -1266,9 +1266,9 @@ } Scsi_Host_Template aic7xxx_driver_template = { + .module = THIS_MODULE, + .name = "aic7xxx", .proc_info = ahc_linux_proc_info, - .detect = ahc_linux_detect, - .release = ahc_linux_release, .info = ahc_linux_info, .queuecommand = ahc_linux_queue, .eh_abort_handler = ahc_linux_abort, @@ -1300,19 +1300,17 @@ #endif #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - .name = "aic7xxx", .slave_alloc = ahc_linux_slave_alloc, .slave_configure = ahc_linux_slave_configure, .slave_destroy = ahc_linux_slave_destroy, #else + .detect = ahc_linux_detect, + .release = ahc_linux_release, .select_queue_depths = ahc_linux_select_queue_depth, .use_new_eh_code = 1, #endif }; -#define driver_template aic7xxx_driver_template -#include "scsi_module.c" - /**************************** Tasklet Handler *********************************/ static void @@ -1861,9 +1859,8 @@ ahc_set_name(ahc, new_name); } host->unique_id = ahc->unit; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - scsi_set_device(host, &ahc->dev_softc->dev); -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,4) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,4) && \ + LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) scsi_set_pci_device(host, ahc->dev_softc); #endif ahc_linux_initialize_scsi_bus(ahc); @@ -1897,6 +1894,10 @@ ahc_intr_enable(ahc, TRUE); ahc_linux_start_dv(ahc); ahc_unlock(ahc, &s); + +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + scsi_add_host(host, (ahc->dev_softc ? &ahc->dev_softc->dev : NULL)); +#endif return (0); } @@ -2075,8 +2076,12 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) tasklet_kill(&ahc->platform_data->runq_tasklet); #endif - if (ahc->platform_data->host != NULL) + if (ahc->platform_data->host != NULL) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + scsi_remove_host(ahc->platform_data->host); +#endif scsi_unregister(ahc->platform_data->host); + } /* destroy all of the device and target objects */ for (i = 0; i < AHC_NUM_TARGETS; i++) { @@ -2112,19 +2117,16 @@ #endif } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - /* XXX Need an instance detach in the PCI code */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) + /* + * In 2.4 we detach from the scsi midlayer before the PCI + * layer invokes our remove callback. + */ if (ahc->dev_softc != NULL) ahc->dev_softc->driver = NULL; #endif - free(ahc->platform_data, M_DEVBUF); - } - if (TAILQ_EMPTY(&ahc_tailq)) { - unregister_reboot_notifier(&ahc_linux_notifier); -#ifdef CONFIG_PCI -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - pci_unregister_driver(&aic7xxx_pci_driver); -#endif #endif + free(ahc->platform_data, M_DEVBUF); } } @@ -5182,3 +5184,51 @@ } } } + +static int __init ahc_linux_init(void) +{ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + return (ahc_linux_detect(&aic7xxx_driver_template) ? 0 : -ENODEV); +#else + scsi_register_module(MODULE_SCSI_HA, &aic7xxx_driver_template); + if (!driver_template.present) { + scsi_unregister_module(MODULE_SCSI_HA, + &aic7xxx_driver_template); + return (-ENODEV); + } + + return (0); +#endif +} + +static void __exit ahc_linux_exit(void) +{ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) + struct ahc_softc *ahc; + + ahc_linux_pci_exit(); + + /* + * Get rid of the non-pci devices. + * + * XXX(hch): switch over eisa support to new LDM-based API + */ + TAILQ_FOREACH(ahc, &ahc_tailq, links) + ahc_linux_release(ahc->platform_data->host); +#else + scsi_unregister_module(MODULE_SCSI_HA, &aic7xxx_driver_template); + + /* + * In 2.4 we have to unregister from the PCI core _after_ + * unregistering from the scsi midlayer to avoid danling references. + * + * The 2.4 scsi midlayer is so f***ed.. + */ + ahc_linux_pci_exit(); +#endif + + unregister_reboot_notifier(&ahc_linux_notifier); +} + +module_init(ahc_linux_init); +module_exit(ahc_linux_exit); diff -Nru a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h Thu Feb 27 01:44:22 2003 @@ -912,7 +912,8 @@ #include #endif -int ahc_linux_pci_probe(Scsi_Host_Template *); +int ahc_linux_pci_init(void); +void ahc_linux_pci_exit(void); int ahc_pci_map_registers(struct ahc_softc *ahc); int ahc_pci_map_int(struct ahc_softc *ahc); diff -Nru a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c Thu Feb 27 01:44:21 2003 +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c Thu Feb 27 01:44:21 2003 @@ -179,14 +179,21 @@ } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) pci_set_drvdata(pdev, ahc); - if (aic7xxx_detect_complete) + if (aic7xxx_detect_complete) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) ahc_linux_register_host(ahc, &aic7xxx_driver_template); +#else + printf("aic7xxx: ignoring PCI device found after " + "initialization\n"); + return (-ENODEV); +#endif + } #endif return (0); } int -ahc_linux_pci_probe(Scsi_Host_Template *template) +ahc_linux_pci_init(void) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) return (pci_module_init(&aic7xxx_pci_driver)); @@ -213,6 +220,12 @@ } return (found); #endif +} + +void +ahc_linux_pci_exit(void) +{ + pci_unregister_driver(&aic7xxx_pci_driver); } static int diff -Nru a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c --- a/drivers/scsi/aic7xxx_old.c Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/aic7xxx_old.c Thu Feb 27 01:44:22 2003 @@ -111,7 +111,7 @@ * but are not limited to: * * 1: Import of the latest FreeBSD sequencer code for this driver - * 2: Modification of kernel code to accomodate different sequencer semantics + * 2: Modification of kernel code to accommodate different sequencer semantics * 3: Extensive changes throughout kernel portion of driver to improve * abort/reset processing and error hanndling * 4: Other work contributed by various people on the Internet @@ -4609,8 +4609,8 @@ * handler do the rest. We don't want to unpause the sequencer yet * though so we'll return early. We also have to make sure that * we clear the SEQINT *BEFORE* we set the REQINIT handler active - * or else it's possible on VLB cards to loose the first REQINIT - * interrupt. Edge triggered EISA cards could also loose this + * or else it's possible on VLB cards to lose the first REQINIT + * interrupt. Edge triggered EISA cards could also lose this * interrupt, although PCI and level triggered cards should not * have this problem since they continually interrupt the kernel * until we take care of the situation. @@ -4945,9 +4945,9 @@ target_mask = (0x01 << tindex); /* - * Parse as much of the message as is availible, + * Parse as much of the message as is available, * rejecting it if we don't support it. When - * the entire message is availible and has been + * the entire message is available and has been * handled, return TRUE indicating that we have * parsed an entire message. */ @@ -10392,7 +10392,7 @@ aic7xxx_done_cmds_complete(p); /* If the command was already complete or just completed, then we didn't * do a reset, return FAILED */ - if(!scb->flags & SCB_ACTIVE) + if(!(scb->flags & SCB_ACTIVE)) return FAILED; pause_sequencer(p); @@ -10615,7 +10615,7 @@ aic7xxx_done_cmds_complete(p); /* If the command was already complete or just completed, then we didn't * do a reset, return FAILED */ - if(!scb->flags & SCB_ACTIVE) + if(!(scb->flags & SCB_ACTIVE)) return FAILED; pause_sequencer(p); diff -Nru a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c --- a/drivers/scsi/atari_NCR5380.c Thu Feb 27 01:44:24 2003 +++ b/drivers/scsi/atari_NCR5380.c Thu Feb 27 01:44:24 2003 @@ -2543,7 +2543,7 @@ phase = PHASE_MSGIN; NCR5380_transfer_pio(instance, &phase, &len, &data); - if (!msg[0] & 0x80) { + if (!(msg[0] & 0x80)) { printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); print_msg(msg); do_abort(instance); @@ -2953,7 +2953,7 @@ * on any queue, so they won't be retried ... * * Conclusion: either scsi.c disables timeout for all resetted commands - * immediately, or we loose! As of linux-2.0.20 it doesn't. + * immediately, or we lose! As of linux-2.0.20 it doesn't. */ /* After the reset, there are no more connected or disconnected commands diff -Nru a/drivers/scsi/cpqfcTScontrol.c b/drivers/scsi/cpqfcTScontrol.c --- a/drivers/scsi/cpqfcTScontrol.c Thu Feb 27 01:44:18 2003 +++ b/drivers/scsi/cpqfcTScontrol.c Thu Feb 27 01:44:18 2003 @@ -586,7 +586,7 @@ -// This "look ahead" function examines the IMQ for occurence of +// This "look ahead" function examines the IMQ for occurrence of // "type". Returns 1 if found, 0 if not. static int PeekIMQEntry( PTACHYON fcChip, ULONG type) { diff -Nru a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c --- a/drivers/scsi/cpqfcTSinit.c Thu Feb 27 01:44:17 2003 +++ b/drivers/scsi/cpqfcTSinit.c Thu Feb 27 01:44:17 2003 @@ -1514,7 +1514,7 @@ Exchanges->fcExchange[i].timeOut = 10; // seconds default (changed later) // Since we need to immediately return the aborted Cmnd to Scsi - // upper layers, we can't make future reference to any of it's + // upper layers, we can't make future reference to any of its // fields (e.g the Nexus). cpqfcTSPutLinkQue( cpqfcHBAdata, BLS_ABTS, &i); diff -Nru a/drivers/scsi/cpqfcTSworker.c b/drivers/scsi/cpqfcTSworker.c --- a/drivers/scsi/cpqfcTSworker.c Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/cpqfcTSworker.c Thu Feb 27 01:44:27 2003 @@ -79,7 +79,7 @@ // synchronously (i.e. each of the 30k I/O had to be started one at a // time by sending a starting frame via Tachyon's outbound que). -// To accomodate kernel "module" build, this driver limits the exchanges +// To accommodate kernel "module" build, this driver limits the exchanges // to 256, because of the contiguous physical memory limitation of 128M. // Typical FC Exchanges are opened presuming the FC frames start without errors, diff -Nru a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c --- a/drivers/scsi/dpt_i2o.c Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/dpt_i2o.c Thu Feb 27 01:44:27 2003 @@ -86,7 +86,7 @@ #elif defined(__alpha__) PROC_ALPHA , #else - (-1), + (-1),(-1) #endif FT_HBADRVR, 0, OEM_DPT, OS_LINUX, CAP_OVERLAP, DEV_ALL, ADF_ALL_SC5, 0, 0, DPT_VERSION, DPT_REVISION, DPT_SUBREVISION, @@ -1135,7 +1135,8 @@ // to support async LCT get wait_data->next = adpt_post_wait_queue; adpt_post_wait_queue = wait_data; - adpt_post_wait_id = (++adpt_post_wait_id & 0x7fff); + adpt_post_wait_id++; + adpt_post_wait_id &= 0x7fff; wait_data->id = adpt_post_wait_id; spin_unlock_irqrestore(&adpt_post_wait_lock, flags); @@ -1252,7 +1253,7 @@ } } spin_unlock(&adpt_post_wait_lock); - // If this happens we loose commands that probably really completed + // If this happens we lose commands that probably really completed printk(KERN_DEBUG"dpti: Could Not find task %d in wait queue\n",context); printk(KERN_DEBUG" Tasks in wait queue:\n"); for(p1 = adpt_post_wait_queue; p1; p1 = p1->next) { diff -Nru a/drivers/scsi/esp.c b/drivers/scsi/esp.c --- a/drivers/scsi/esp.c Thu Feb 27 01:44:30 2003 +++ b/drivers/scsi/esp.c Thu Feb 27 01:44:30 2003 @@ -3567,7 +3567,7 @@ /* Target negotiates for synchronous transfers before we do, this * is legal although very strange. What is even funnier is that * the SCSI2 standard specifically recommends against targets doing - * this because so many initiators cannot cope with this occuring. + * this because so many initiators cannot cope with this occurring. */ static int target_with_ants_in_pants(struct esp *esp, Scsi_Cmnd *SCptr, diff -Nru a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c --- a/drivers/scsi/fdomain.c Thu Feb 27 01:44:26 2003 +++ b/drivers/scsi/fdomain.c Thu Feb 27 01:44:26 2003 @@ -725,13 +725,13 @@ switch (Quantum) { case 2: /* ISA_200S */ case 3: /* ISA_250MG */ - base = readb(bios_base + 0x1fa2) + (readb(bios_base + 0x1fa3) << 8); + base = isa_readb(bios_base + 0x1fa2) + (isa_readb(bios_base + 0x1fa3) << 8); break; case 4: /* ISA_200S (another one) */ - base = readb(bios_base + 0x1fa3) + (readb(bios_base + 0x1fa4) << 8); + base = isa_readb(bios_base + 0x1fa3) + (isa_readb(bios_base + 0x1fa4) << 8); break; default: - base = readb(bios_base + 0x1fcc) + (readb(bios_base + 0x1fcd) << 8); + base = isa_readb(bios_base + 0x1fcc) + (isa_readb(bios_base + 0x1fcd) << 8); break; } @@ -1777,7 +1777,7 @@ offset = bios_base + 0x1f31 + drive * 25; break; } - memcpy_fromio( &i, offset, sizeof( struct drive_info ) ); + isa_memcpy_fromio( &i, offset, sizeof( struct drive_info ) ); info_array[0] = i.heads; info_array[1] = i.sectors; info_array[2] = i.cylinders; diff -Nru a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c --- a/drivers/scsi/g_NCR5380.c Thu Feb 27 01:44:19 2003 +++ b/drivers/scsi/g_NCR5380.c Thu Feb 27 01:44:19 2003 @@ -323,7 +323,7 @@ printk(KERN_ERR "dtc436e probe: attach failed\n"); continue; } - if (pnp_activate_dev(dev, NULL) < 0) { + if (pnp_activate_dev(dev) < 0) { printk(KERN_ERR "dtc436e probe: activate failed\n"); pnp_device_detach(dev); continue; diff -Nru a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c --- a/drivers/scsi/gdth.c Thu Feb 27 01:44:25 2003 +++ b/drivers/scsi/gdth.c Thu Feb 27 01:44:25 2003 @@ -28,7 +28,7 @@ * * * $Log: gdth.c,v $ * Revision 1.61 2002/10/03 09:35:22 boji - * Fixed SCREENSERVICE intialisation in SMP cases. + * Fixed SCREENSERVICE initialisation in SMP cases. * Added checks for gdth_polling before GDTH_HA_LOCK * * Revision 1.60 2002/02/05 09:35:22 achim diff -Nru a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h --- a/drivers/scsi/gdth.h Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/gdth.h Thu Feb 27 01:44:22 2003 @@ -915,7 +915,7 @@ unchar ldr_no; /* log. drive no. */ unchar rw_attribs; /* r/w attributes */ unchar cluster_type; /* cluster properties */ - unchar media_changed; /* Flag:MOUNT/UNMOUNT occured */ + unchar media_changed; /* Flag:MOUNT/UNMOUNT occurred*/ ulong32 start_sec; /* start sector */ } hdr[MAX_LDRIVES]; /* host drives */ struct { diff -Nru a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c --- a/drivers/scsi/hosts.c Thu Feb 27 01:44:17 2003 +++ b/drivers/scsi/hosts.c Thu Feb 27 01:44:17 2003 @@ -270,21 +270,6 @@ if (scsi_check_device_busy(sdev)) return 1; - /* - * Next we detach the high level drivers from the Scsi_Device - * structures - */ - list_for_each_entry(sdev, &shost->my_devices, siblings) { - scsi_detach_device(sdev); - - /* If something still attached, punt */ - if (sdev->attached) { - printk(KERN_ERR "Attached usage count = %d\n", - sdev->attached); - return 1; - } - } - scsi_forget_host(shost); return 0; } diff -Nru a/drivers/scsi/ips.c b/drivers/scsi/ips.c --- a/drivers/scsi/ips.c Thu Feb 27 01:44:16 2003 +++ b/drivers/scsi/ips.c Thu Feb 27 01:44:17 2003 @@ -1801,7 +1801,7 @@ /* */ /* Routine Description: */ /* Fill in a single scb sg_list element from an address */ -/* return a -1 if a breakup occured */ +/* return a -1 if a breakup occurred */ /****************************************************************************/ static inline int ips_fill_scb_sg_single(ips_ha_t *ha, dma_addr_t busaddr, ips_scb_t *scb, int indx, unsigned int e_len) @@ -2737,7 +2737,7 @@ scb->dcdb.cmd_attribute = ips_command_direction[scb->scsi_cmd->cmnd[0]]; - if (!scb->dcdb.cmd_attribute & 0x3) + if (!(scb->dcdb.cmd_attribute & 0x3)) scb->dcdb.transfer_length = 0; if (scb->data_len >= IPS_MAX_XFER) { @@ -3315,7 +3315,7 @@ scb->dcdb.transfer_length = scb->data_len; scb->dcdb.cmd_attribute |= ips_command_direction[scb->scsi_cmd->cmnd[0]]; - if (!scb->dcdb.cmd_attribute & 0x3) + if (!(scb->dcdb.cmd_attribute & 0x3)) scb->dcdb.transfer_length = 0; if (scb->data_len >= IPS_MAX_XFER) { diff -Nru a/drivers/scsi/mac_NCR5380.c b/drivers/scsi/mac_NCR5380.c --- a/drivers/scsi/mac_NCR5380.c Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/mac_NCR5380.c Thu Feb 27 01:44:27 2003 @@ -2694,7 +2694,7 @@ phase = PHASE_MSGIN; NCR5380_transfer_pio(instance, &phase, &len, &data); - if (!msg[0] & 0x80) { + if (!(msg[0] & 0x80)) { printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); print_msg(msg); do_abort(instance); @@ -3082,7 +3082,7 @@ * on any queue, so they won't be retried ... * * Conclusion: either scsi.c disables timeout for all resetted commands - * immediately, or we loose! As of linux-2.0.20 it doesn't. + * immediately, or we lose! As of linux-2.0.20 it doesn't. */ /* After the reset, there are no more connected or disconnected commands diff -Nru a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c --- a/drivers/scsi/megaraid.c Thu Feb 27 01:44:16 2003 +++ b/drivers/scsi/megaraid.c Thu Feb 27 01:44:16 2003 @@ -309,7 +309,7 @@ * Thu Mar 15 18:38:11 EST 2001 - AM * * Firmware version check removed if subsysid==0x1111 and - * subsysvid==0x1111, since its not yet initialized. + * subsysvid==0x1111, since it's not yet initialized. * * changes made to correctly calculate the base in mega_findCard. * @@ -1714,7 +1714,7 @@ unsigned char *data = (unsigned char *) SCpnt->request_buffer; mega_driver_info driver_info; - /* If this is not our command dont do anything */ + /* If this is not our command don't do anything */ if (SCpnt->cmnd[0] != M_RD_DRIVER_IOCTL_INTERFACE) return 0; @@ -2879,7 +2879,7 @@ #endif } - /* Hmmm...Should we not make this more modularized so that in future we dont add + /* Hmmm...Should we not make this more modularized so that in future we don't add for each firmware */ if (flag & BOARD_QUARTZ) { @@ -2906,7 +2906,7 @@ * pci_vendor_id not subsysvid - AM */ - /* If we dont detect this valid subsystem vendor id's + /* If we don't detect this valid subsystem vendor id's we refuse to load the driver PART of PC200X compliance */ diff -Nru a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c --- a/drivers/scsi/ncr53c8xx.c Thu Feb 27 01:44:21 2003 +++ b/drivers/scsi/ncr53c8xx.c Thu Feb 27 01:44:21 2003 @@ -1536,7 +1536,7 @@ /* ** Now there are 4 possibilities: ** - ** (1) The ncr looses arbitration. + ** (1) The ncr loses arbitration. ** This is ok, because it will try again, ** when the bus becomes idle. ** (But beware of the timeout function!) @@ -3090,7 +3090,7 @@ case 0x8: /* ** JUMP / CALL - ** dont't relocate if relative :-) + ** don't relocate if relative :-) */ if (opcode & 0x00800000) relocs = 0; @@ -5852,7 +5852,7 @@ /* ** Why not to try the immediate lower divisor and to choose ** the one that allows the fastest output speed ? - ** We dont want input speed too much greater than output speed. + ** We don't want input speed too much greater than output speed. */ if (div >= 1 && fak < 8) { u_long fak2, per2; diff -Nru a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c --- a/drivers/scsi/nsp32.c Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/nsp32.c Thu Feb 27 01:44:22 2003 @@ -939,7 +939,7 @@ /* * If reselected New ID:LUN is not existed * or current nexus is not existed, unexpected - * reselection is occured. Send reject message. + * reselection is occurred. Send reject message. */ if (newid >= MAX_TARGET || newlun >= MAX_LUN) { nsp32_msg(KERN_WARNING, "unknown id/lun"); @@ -1333,7 +1333,7 @@ /* * AutoSCSI Interrupt. - * Note: This interrupt is occured when AutoSCSI is finished. Then + * Note: This interrupt is occurred when AutoSCSI is finished. Then * check SCSIEXECUTEPHASE, and do appropriate action. Each phases are * recorded when AutoSCSI sequencer has been processed. */ @@ -1345,7 +1345,7 @@ /* Selection Timeout, go busfree phase. */ if (auto_stat & SELECTION_TIMEOUT) { nsp32_dbg(NSP32_DEBUG_INTR, - "selection timeout occured"); + "selection timeout occurred"); SCpnt->result = DID_TIME_OUT << 16; nsp32_scsi_done(data, SCpnt); @@ -1357,7 +1357,7 @@ * MsgOut phase was processed. * If MSG_IN_OCCUER is not set, then MsgOut phase is * completed. Thus, msgoutlen must reset. Otherwise, - * nothing to do here. If MSG_OUT_OCCUER is occured, + * nothing to do here. If MSG_OUT_OCCUER is occurred, * then we will encounter the condition and check. */ if (!(auto_stat & MSG_IN_OCCUER) && @@ -1515,7 +1515,7 @@ /* PCI_IRQ */ if (irq_stat & IRQSTATUS_PCI_IRQ) { - nsp32_dbg(NSP32_DEBUG_INTR, "PCI IRQ occured"); + nsp32_dbg(NSP32_DEBUG_INTR, "PCI IRQ occurred"); /* Do nothing */ } @@ -1524,7 +1524,7 @@ nsp32_msg(KERN_ERR, "Received unexpected BMCNTERR IRQ! "); /* * TODO: To be implemented improving bus master - * transfer reliablity when BMCNTERR is occured in + * transfer reliablity when BMCNTERR is occurred in * AutoSCSI phase described in specification. */ } @@ -2300,7 +2300,7 @@ } else { /* * On the contrary, if unexpected bus free is - * occured, then negotiation is failed. Fall + * occurred, then negotiation is failed. Fall * back to ASYNC mode. */ nsp32_set_async(data, data->curtarget); @@ -2338,7 +2338,7 @@ return (TRUE); } else { /* Unexpected bus free */ - nsp32_msg(KERN_WARNING, "unexpected bus free occured"); + nsp32_msg(KERN_WARNING, "unexpected bus free occurred"); /* DID_ERROR? */ //SCpnt->result = (DID_OK << 16) | (SCpnt->SCp.Message << 8) | (SCpnt->SCp.Status << 0); @@ -2426,7 +2426,7 @@ "enter: msgoutlen: 0x%x", data->msgoutlen); /* - * If MsgOut phase is occured without having any + * If MsgOut phase is occurred without having any * message, then No_Operation is sent (SCSI-2). */ if (data->msgoutlen == 0) { @@ -2614,7 +2614,7 @@ case COMMAND_COMPLETE: case DISCONNECT: /* - * These messages should not be occured. + * These messages should not be occurred. * They should be processed on AutoSCSI sequencer. */ nsp32_msg(KERN_WARNING, @@ -2654,7 +2654,7 @@ case SAVE_POINTERS: /* - * These messages should not be occured. + * These messages should not be occurred. * They should be processed on AutoSCSI sequencer. */ nsp32_msg (KERN_WARNING, diff -Nru a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c --- a/drivers/scsi/oktagon_esp.c Thu Feb 27 01:44:17 2003 +++ b/drivers/scsi/oktagon_esp.c Thu Feb 27 01:44:17 2003 @@ -245,7 +245,7 @@ if((code == SYS_DOWN || code == SYS_HALT) && (esp = current_esp)) { esp_bootup_reset(esp,esp->eregs); - udelay(500); /* Settle time. Maybe unneccessary. */ + udelay(500); /* Settle time. Maybe unnecessary. */ } return NOTIFY_DONE; } diff -Nru a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c --- a/drivers/scsi/pcmcia/fdomain_stub.c Thu Feb 27 01:44:25 2003 +++ b/drivers/scsi/pcmcia/fdomain_stub.c Thu Feb 27 01:44:25 2003 @@ -2,7 +2,7 @@ A driver for Future Domain-compatible PCMCIA SCSI cards - fdomain_cs.c 1.43 2000/06/12 21:27:25 + fdomain_cs.c 1.47 2001/10/13 00:08:52 The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file @@ -19,8 +19,8 @@ are Copyright (C) 1999 David A. Hinds. All Rights Reserved. Alternatively, the contents of this file may be used under the - terms of the GNU General Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the + terms of the GNU General Public License version 2 (the "GPL"), in + which case the provisions of the GPL are applicable instead of the above. If you wish to allow the use of your version of this file only under the terms of the GPL and not to allow others to use your version of this file under the MPL, indicate your decision @@ -53,27 +53,30 @@ #include #include -#ifdef PCMCIA_DEBUG -static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); -#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) -static char *version = -"fdomain_cs.c 1.43 2000/06/12 21:27:25 (David Hinds)"; -#else -#define DEBUG(n, args...) -#endif - /*====================================================================*/ -/* Parameters that can be set with 'insmod' */ +/* Module parameters */ + +MODULE_AUTHOR("David Hinds "); +MODULE_DESCRIPTION("Future Domain PCMCIA SCSI driver"); +MODULE_LICENSE("Dual MPL/GPL"); + +#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i") /* Bit map of interrupts to choose from */ -static u_int irq_mask = 0xdeb8; +INT_MODULE_PARM(irq_mask, 0xdeb8); static int irq_list[4] = { -1 }; - -MODULE_PARM(irq_mask, "i"); MODULE_PARM(irq_list, "1-4i"); +#ifdef PCMCIA_DEBUG +INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); +#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) +static char *version = +"fdomain_cs.c 1.47 2001/10/13 00:08:52 (David Hinds)"; +#else +#define DEBUG(n, args...) +#endif + /*====================================================================*/ typedef struct scsi_info_t { @@ -213,6 +216,7 @@ u_char tuple_data[64]; Scsi_Device *dev; dev_node_t *node, **tail; + char str[16]; struct Scsi_Host *host; DEBUG(0, "fdomain_config(0x%p)\n", link); @@ -253,7 +257,8 @@ ints[0] = 2; ints[1] = link->io.BasePort1; ints[2] = link->irq.AssignedIRQ; - fdomain_setup("PCMCIA setup", ints); + sprintf(str, "%d,%d", link->io.BasePort1, link->irq.AssignedIRQ); + fdomain_setup(str, ints); scsi_register_host(&driver_template); diff -Nru a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c --- a/drivers/scsi/pcmcia/nsp_cs.c Thu Feb 27 01:44:30 2003 +++ b/drivers/scsi/pcmcia/nsp_cs.c Thu Feb 27 01:44:30 2003 @@ -128,7 +128,7 @@ MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))"); /* /usr/src/linux/drivers/scsi/hosts.h */ -static Scsi_Host_Template driver_template = { +static Scsi_Host_Template nsp_driver_template = { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)) .proc_name = "nsp_cs", /* kernel 2.4 */ #else @@ -136,8 +136,10 @@ #endif .proc_info = nsp_proc_info, .name = "WorkBit NinjaSCSI-3/32Bi(16bit)", +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) .detect = nsp_detect, .release = nsp_release, +#endif .info = nsp_info, .queuecommand = nsp_queuecommand, /* .eh_strategy_handler = nsp_eh_strategy,*/ @@ -1215,7 +1217,7 @@ /*----------------------------------------------------------------*/ /* look for ninja3 card and init if found */ /*----------------------------------------------------------------*/ -static int nsp_detect(Scsi_Host_Template *sht) +static struct Scsi_Host *__nsp_detect(Scsi_Host_Template *sht) { struct Scsi_Host *host; /* registered host structure */ nsp_hw_data *data = &nsp_data; @@ -1225,7 +1227,7 @@ request_region(data->BaseAddress, data->NumAddress, "nsp_cs"); host = scsi_register(sht, 0); if(host == NULL) - return 0; + return NULL; host->unique_id = data->BaseAddress; host->io_port = data->BaseAddress; @@ -1252,7 +1254,13 @@ //MOD_INC_USE_COUNT; - return 1; /* detect done. */ + return host; +} + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) +static int nsp_detect(Scsi_Host_Template *sht) +{ + return (__nsp_detect(sht) != NULL); } static int nsp_release(struct Scsi_Host *shpnt) @@ -1271,6 +1279,7 @@ return 0; } +#endif /*----------------------------------------------------------------*/ /* return info string */ @@ -1763,55 +1772,53 @@ } #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,2)) - scsi_register_host(&driver_template); + host = __nsp_detect(&nsp_driver_template); #else - scsi_register_module(MODULE_SCSI_HA, &driver_template); + scsi_register_module(MODULE_SCSI_HA, &nsp_driver_template); + for (host = scsi_hostlist; host != NULL; host = host->next) { + if (host->hostt == &nsp_driver_template) + break; #endif + if (!host) + goto cs_failed; + DEBUG(0, "GET_SCSI_INFO\n"); tail = &link->dev; info->ndev = 0; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,45)) - for (host = scsi_host_get_next(NULL); host; - host = scsi_host_get_next(host)) { -#else - for (host = scsi_hostlist; host != NULL; host = host->next) { -#endif - if (host->hostt == &driver_template) { - list_for_each_entry (dev, &host->my_devices, siblings) { - u_long arg[2], id; - kernel_scsi_ioctl(dev, SCSI_IOCTL_GET_IDLUN, arg); - id = (arg[0]&0x0f) + ((arg[0]>>4)&0xf0) + - ((arg[0]>>8)&0xf00) + ((arg[0]>>12)&0xf000); - node = &info->node[info->ndev]; - node->minor = 0; - switch (dev->type) { - case TYPE_TAPE: - node->major = SCSI_TAPE_MAJOR; - sprintf(node->dev_name, "st#%04lx", id); - break; - case TYPE_DISK: - case TYPE_MOD: - node->major = SCSI_DISK0_MAJOR; - sprintf(node->dev_name, "sd#%04lx", id); - break; - case TYPE_ROM: - case TYPE_WORM: - node->major = SCSI_CDROM_MAJOR; - sprintf(node->dev_name, "sr#%04lx", id); - break; - default: - node->major = SCSI_GENERIC_MAJOR; - sprintf(node->dev_name, "sg#%04lx", id); - break; - } - *tail = node; tail = &node->next; - info->ndev++; - info->host = dev->host; - } + list_for_each_entry (dev, &host->my_devices, siblings) { + u_long arg[2], id; + kernel_scsi_ioctl(dev, SCSI_IOCTL_GET_IDLUN, arg); + id = (arg[0]&0x0f) + ((arg[0]>>4)&0xf0) + + ((arg[0]>>8)&0xf00) + ((arg[0]>>12)&0xf000); + node = &info->node[info->ndev]; + node->minor = 0; + switch (dev->type) { + case TYPE_TAPE: + node->major = SCSI_TAPE_MAJOR; + sprintf(node->dev_name, "st#%04lx", id); + break; + case TYPE_DISK: + case TYPE_MOD: + node->major = SCSI_DISK0_MAJOR; + sprintf(node->dev_name, "sd#%04lx", id); + break; + case TYPE_ROM: + case TYPE_WORM: + node->major = SCSI_CDROM_MAJOR; + sprintf(node->dev_name, "sr#%04lx", id); + break; + default: + node->major = SCSI_GENERIC_MAJOR; + sprintf(node->dev_name, "sg#%04lx", id); + break; } + *tail = node; tail = &node->next; + info->ndev++; + info->host = dev->host; } + *tail = NULL; if (info->ndev == 0) { printk(KERN_INFO "nsp_cs: no SCSI devices found\n"); @@ -1839,6 +1846,10 @@ req.Base+req.Size-1); printk("\n"); +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) + scsi_add_host(host, NULL); +#endif + link->state &= ~DEV_CONFIG_PENDING; return; @@ -1859,6 +1870,7 @@ static void nsp_cs_release(u_long arg) { dev_link_t *link = (dev_link_t *)arg; + scsi_info_t *info = link->priv; DEBUG(0, "%s(0x%p)\n", __FUNCTION__, link); @@ -1874,10 +1886,11 @@ } /* Unlink the device chain */ -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,2)) - scsi_unregister_host(&driver_template); +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,2)) + scsi_unregister_module(MODULE_SCSI_HA, &nsp_driver_template); #else - scsi_unregister_module(MODULE_SCSI_HA, &driver_template); + scsi_remove_host(info->host); + scsi_unregister(info->host); #endif link->dev = NULL; diff -Nru a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h --- a/drivers/scsi/pcmcia/nsp_cs.h Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/pcmcia/nsp_cs.h Thu Feb 27 01:44:22 2003 @@ -280,8 +280,6 @@ static unsigned int nsphw_start_selection(Scsi_Cmnd *SCpnt, nsp_hw_data *data); static void nsp_start_timer(Scsi_Cmnd *SCpnt, nsp_hw_data *data, int time); -static int nsp_detect(Scsi_Host_Template * ); -static int nsp_release(struct Scsi_Host *shpnt); static const char *nsp_info(struct Scsi_Host *shpnt); static int nsp_proc_info(char *buffer, char **start, off_t offset, int length, int hostno, int inout); diff -Nru a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c --- a/drivers/scsi/qlogicfc.c Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/qlogicfc.c Thu Feb 27 01:44:27 2003 @@ -1563,7 +1563,7 @@ /* * if any of the following are true we do not * call scsi_done. if the status is CS_ABORTED - * we dont have to call done because the upper + * we don't have to call done because the upper * level should already know its aborted. */ if (hostdata->handle_serials[le_hand] != Cmnd->serial_number diff -Nru a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c --- a/drivers/scsi/qlogicpti.c Thu Feb 27 01:44:26 2003 +++ b/drivers/scsi/qlogicpti.c Thu Feb 27 01:44:26 2003 @@ -776,7 +776,7 @@ } /* The request and response queues must each be aligned - * on a page boundry. + * on a page boundary. */ static int __init qpti_map_queues(struct qlogicpti *qpti) { diff -Nru a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c --- a/drivers/scsi/scsi.c Thu Feb 27 01:44:23 2003 +++ b/drivers/scsi/scsi.c Thu Feb 27 01:44:23 2003 @@ -1308,7 +1308,8 @@ void scsi_set_device_offline(struct scsi_device *sdev) { struct scsi_cmnd *scmd; - int cmds_active = 0; + LIST_HEAD(active_list); + struct list_head *lh, *lh_sf; unsigned long flags; sdev->online = FALSE; @@ -1324,15 +1325,17 @@ if (!scsi_delete_timer(scmd)) { continue; } - - ++cmds_active; - - scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD); + list_add_tail(&scmd->eh_entry, &active_list); } } spin_unlock_irqrestore(&sdev->list_lock, flags); - if (!cmds_active) { + if (!list_empty(&active_list)) { + list_for_each_safe(lh, lh_sf, &active_list) { + scmd = list_entry(lh, struct scsi_cmnd, eh_entry); + scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD); + } + } else { /* FIXME: Send online state change hotplug event */ } } diff -Nru a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h --- a/drivers/scsi/scsi.h Thu Feb 27 01:44:20 2003 +++ b/drivers/scsi/scsi.h Thu Feb 27 01:44:20 2003 @@ -503,8 +503,9 @@ /* * Prototypes for functions in scsi_scan.c */ -extern int scsi_add_single_device(uint, uint, uint, uint); -extern int scsi_remove_single_device(uint, uint, uint, uint); +extern struct scsi_device *scsi_add_device(struct Scsi_Host *, + uint, uint, uint); +extern int scsi_remove_device(struct scsi_device *); extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); /* diff -Nru a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c --- a/drivers/scsi/scsi_ioctl.c Thu Feb 27 01:44:30 2003 +++ b/drivers/scsi/scsi_ioctl.c Thu Feb 27 01:44:30 2003 @@ -194,7 +194,7 @@ * of the given command. There is no way to override this. * - Data transfers are limited to PAGE_SIZE (4K on i386, 8K on alpha). * - The length (x + y) must be at least OMAX_SB_LEN bytes long to - * accomodate the sense buffer when an error occurs. + * accommodate the sense buffer when an error occurs. * The sense buffer is truncated to OMAX_SB_LEN (16) bytes so that * old code will not be surprised. * - If a Unix error occurs (e.g. ENOMEM) then the user will receive diff -Nru a/drivers/scsi/scsi_pc98.c b/drivers/scsi/scsi_pc98.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/scsi/scsi_pc98.c Thu Feb 27 01:44:31 2003 @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2003 Osamu Tomita + * + * PC9801 BIOS geometry handling. + */ + +#include +#include +#include +#include +#include +#include + +#include "scsi.h" +#include "hosts.h" + + +/* XXX - For now, we assume the first (i.e. having the least host_no) + real (i.e. non-emulated) host adapter shall be BIOS-controlled one. + We *SHOULD* invent another way. */ +static inline struct Scsi_Host *first_real_host(void) +{ + struct Scsi_Host *shost = NULL; + + while ((shost = scsi_host_get_next(shost))) { + if (!shost->hostt->emulated) + break; + } + + return shost; +} + +static int pc98_first_bios_param(struct scsi_device *sdev, int *ip) +{ + const u8 *p = (&__PC9800SCA(u8, PC9800SCA_SCSI_PARAMS) + sdev->id * 4); + + ip[0] = p[1]; /* # of heads */ + ip[1] = p[0]; /* # of sectors/track */ + ip[2] = *(u16 *)&p[2] & 0x0fff; /* # of cylinders */ + if (p[3] & (1 << 6)) { /* #-of-cylinders is 16-bit */ + ip[2] |= (ip[0] & 0xf0) << 8; + ip[0] &= 0x0f; + } + + return 0; +} + +int pc98_bios_param(struct scsi_device *sdev, struct block_device *bdev, + sector_t capacity, int *ip) +{ + static struct Scsi_Host *first_real = first_real_host(); + + if (sdev->host == first_real && sdev->id < 7 && + __PC9800SCA_TEST_BIT(PC9800SCA_DISK_EQUIPS, sdev->id)) + return pc98_first_bios_param(sdev, ip); + + /* Assume PC-9801-92 compatible parameters for HAs without BIOS. */ + ip[0] = 8; + ip[1] = 32; + ip[2] = capacity / (8 * 32); + if (ip[2] > 65535) { /* if capacity >= 8GB */ + /* Recent on-board adapters seem to use this parameter. */ + ip[1] = 128; + ip[2] = capacity / (8 * 128); + if (ip[2] > 65535) { /* if capacity >= 32GB */ + /* Clip the number of cylinders. Currently + this is the limit that we deal with. */ + ip[2] = 65535; + } + } + + return 0; +} + +EXPORT_SYMBOL(pc98_bios_param); diff -Nru a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c --- a/drivers/scsi/scsi_proc.c Thu Feb 27 01:44:18 2003 +++ b/drivers/scsi/scsi_proc.c Thu Feb 27 01:44:18 2003 @@ -398,6 +398,50 @@ } #endif /* CONFIG_SCSI_LOGGING */ +static int scsi_add_single_device(uint host, uint channel, uint id, uint lun) +{ + struct Scsi_Host *shost; + struct scsi_device *sdev; + int error = -ENODEV; + + shost = scsi_host_hn_get(host); + if (!shost) + return -ENODEV; + + if (!scsi_find_device(shost, channel, id, lun)) { + sdev = scsi_add_device(shost, channel, id, lun); + if (IS_ERR(sdev)) + error = PTR_ERR(sdev); + else + error = 0; + } + + scsi_host_put(shost); + return error; +} + +static int scsi_remove_single_device(uint host, uint channel, uint id, uint lun) +{ + struct scsi_device *sdev; + struct Scsi_Host *shost; + int error = -ENODEV; + + shost = scsi_host_hn_get(host); + if (!shost) + return -ENODEV; + sdev = scsi_find_device(shost, channel, id, lun); + if (!sdev) + goto out; + if (sdev->access_count) + goto out; + + error = scsi_remove_device(sdev); +out: + scsi_host_put(shost); + return error; +} + + static int proc_scsi_gen_write(struct file * file, const char * buf, unsigned long length, void *data) { diff -Nru a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c --- a/drivers/scsi/scsi_scan.c Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/scsi_scan.c Thu Feb 27 01:44:27 2003 @@ -189,6 +189,8 @@ {"HITACHI", "DF500", "*", BLIST_SPARSELUN}, {"HITACHI", "DF600", "*", BLIST_SPARSELUN}, {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, + {"SUN", "T300", "*", BLIST_SPARSELUN}, + {"SUN", "T4", "*", BLIST_SPARSELUN}, { NULL, NULL, NULL, 0 }, }; @@ -1259,14 +1261,6 @@ return SCSI_SCAN_LUN_PRESENT; } -static void scsi_remove_lun(struct scsi_device *sdev) -{ - devfs_unregister(sdev->de); - scsi_device_unregister(sdev); - - scsi_free_sdev(sdev); -} - /** * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it * @sdevscan: probe the LUN corresponding to this Scsi_Device @@ -1284,90 +1278,77 @@ * SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized **/ static int scsi_probe_and_add_lun(struct Scsi_Host *host, - struct request_queue **q, uint channel, uint id, - uint lun, int *bflagsp) + struct request_queue **q, uint channel, uint id, uint lun, + int *bflagsp, struct scsi_device **sdevp) { - Scsi_Device *sdev = NULL; - Scsi_Request *sreq = NULL; - unsigned char *scsi_result = NULL; - int bflags; - int res; + struct scsi_device *sdev; + struct scsi_request *sreq; + unsigned char *result; + int bflags, res = SCSI_SCAN_NO_RESPONSE; sdev = scsi_alloc_sdev(host, q, channel, id, lun); - if (sdev == NULL) - return SCSI_SCAN_NO_RESPONSE; + if (!sdev) + goto out; sreq = scsi_allocate_request(sdev); - if (sreq == NULL) { - printk(ALLOC_FAILURE_MSG, __FUNCTION__); - res = SCSI_SCAN_NO_RESPONSE; - goto bail_out; - } - /* - * The sreq is for use only with sdevscan. - */ + if (!sreq) + goto out_free_sdev; + result = kmalloc(256, GFP_ATOMIC | + (host->unchecked_isa_dma) ? __GFP_DMA : 0); + if (!result) + goto out_free_sreq; - scsi_result = kmalloc(256, GFP_ATOMIC | - (host->unchecked_isa_dma) ? - GFP_DMA : 0); - if (scsi_result == NULL) { - printk(ALLOC_FAILURE_MSG, __FUNCTION__); - res = SCSI_SCAN_NO_RESPONSE; - goto bail_out; - } - - scsi_probe_lun(sreq, scsi_result, &bflags); + scsi_probe_lun(sreq, result, &bflags); if (sreq->sr_result) - res = SCSI_SCAN_NO_RESPONSE; - else { + goto out_free_result; + + /* + * result contains valid SCSI INQUIRY data. + */ + if ((result[0] >> 5) == 3) { /* - * scsi_result contains valid SCSI INQUIRY data. + * For a Peripheral qualifier 3 (011b), the SCSI + * spec says: The device server is not capable of + * supporting a physical device on this logical + * unit. + * + * For disks, this implies that there is no + * logical disk configured at sdev->lun, but there + * is a target id responding. */ - if ((scsi_result[0] >> 5) == 3) { - /* - * For a Peripheral qualifier 3 (011b), the SCSI - * spec says: The device server is not capable of - * supporting a physical device on this logical - * unit. - * - * For disks, this implies that there is no - * logical disk configured at sdev->lun, but there - * is a target id responding. - */ - SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO + SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: peripheral qualifier of 3," " no device added\n")); - res = SCSI_SCAN_TARGET_PRESENT; - } else { - res = scsi_add_lun(sdev, sreq, scsi_result, &bflags); - if (res == SCSI_SCAN_LUN_PRESENT) { - if ((bflags & BLIST_KEY) != 0) { - sdev->lockable = 0; - scsi_unlock_floptical(sreq, - scsi_result); - /* - * scsi_result no longer contains - * the INQUIRY data. - */ - } - if (bflagsp != NULL) - *bflagsp = bflags; - } + res = SCSI_SCAN_TARGET_PRESENT; + goto out_free_result; + } + + res = scsi_add_lun(sdev, sreq, result, &bflags); + if (res == SCSI_SCAN_LUN_PRESENT) { + if (bflags & BLIST_KEY) { + sdev->lockable = 0; + scsi_unlock_floptical(sreq, result); } + if (bflagsp) + *bflagsp = bflags; } -bail_out: - if (scsi_result != NULL) - kfree(scsi_result); - if (sreq != NULL) - scsi_release_request(sreq); - if (res != SCSI_SCAN_LUN_PRESENT) { - if(q) { + + out_free_result: + kfree(result); + out_free_sreq: + scsi_release_request(sreq); + out_free_sdev: + if (res == SCSI_SCAN_LUN_PRESENT) { + if (*sdevp) + *sdevp = sdev; + } else { + if (q) { *q = sdev->request_queue; sdev->request_queue = NULL; } scsi_free_sdev(sdev); } + out: return res; - } /** @@ -1453,8 +1434,8 @@ * sparse_lun. */ for (lun = 1; lun < max_dev_lun; ++lun) - if ((scsi_probe_and_add_lun(shost, q, channel, id, lun, NULL) - != SCSI_SCAN_LUN_PRESENT) && !sparse_lun) + if ((scsi_probe_and_add_lun(shost, q, channel, id, lun, + NULL, NULL) != SCSI_SCAN_LUN_PRESENT) && !sparse_lun) return; } @@ -1669,7 +1650,7 @@ int res; res = scsi_probe_and_add_lun(sdev->host, q, - sdev->channel, sdev->id, lun, NULL); + sdev->channel, sdev->id, lun, NULL, NULL); if (res == SCSI_SCAN_NO_RESPONSE) { /* * Got some results, but now none, abort. @@ -1691,55 +1672,33 @@ } -int scsi_add_single_device(uint host, uint channel, uint id, uint lun) +struct scsi_device *scsi_add_device(struct Scsi_Host *shost, + uint channel, uint id, uint lun) { - struct Scsi_Host *shost; - int error = -ENODEV; struct scsi_device *sdev; + int error = -ENODEV, res; - shost = scsi_host_hn_get(host); - if (!shost) - return -ENODEV; - if(scsi_find_device(shost, channel, id, lun) != NULL) - goto out; + res = scsi_probe_and_add_lun(shost, NULL, channel, id, lun, + NULL, &sdev); + if (res == SCSI_SCAN_LUN_PRESENT) + error = scsi_attach_device(sdev); - if (scsi_probe_and_add_lun(shost, NULL, channel, id, lun, NULL) == - SCSI_SCAN_LUN_PRESENT) { - error = 0; - sdev = scsi_find_device(shost, channel, id, lun); - scsi_attach_device(sdev); - } -out: - scsi_host_put(shost); - return error; + if (error) + sdev = ERR_PTR(error); + return sdev; } -int scsi_remove_single_device(uint host, uint channel, uint id, uint lun) +int scsi_remove_device(struct scsi_device *sdev) { - struct scsi_device *sdev; - struct Scsi_Host *shost; - int error = -ENODEV; - - shost = scsi_host_hn_get(host); - if (!shost) - return -ENODEV; - sdev = scsi_find_device(shost, channel, id, lun); - if (!sdev) - goto out; - - error = -EBUSY; - if (sdev->access_count) - goto out; scsi_detach_device(sdev); if (sdev->attached) - goto out; + return -EINVAL; - scsi_remove_lun(sdev); - error = 0; + devfs_unregister(sdev->de); + scsi_device_unregister(sdev); -out: - scsi_host_put(shost); - return error; + scsi_free_sdev(sdev); + return 0; } /** @@ -1778,9 +1737,8 @@ * Scan LUN 0, if there is some response, scan further. Ideally, we * would not configure LUN 0 until all LUNs are scanned. */ - res = scsi_probe_and_add_lun(shost, q, channel, id, 0, &bflags); + res = scsi_probe_and_add_lun(shost, q, channel, id, 0, &bflags, &sdev); if (res == SCSI_SCAN_LUN_PRESENT) { - sdev = scsi_find_device(shost, channel, id, 0); if (scsi_report_lun_scan(sdev, q, bflags) != 0) /* * The REPORT LUN did not scan the target, @@ -1846,9 +1804,13 @@ void scsi_forget_host(struct Scsi_Host *shost) { struct list_head *le, *lh; + struct scsi_device *sdev; - list_for_each_safe(le, lh, &shost->my_devices) - scsi_remove_lun(list_entry(le, struct scsi_device, siblings)); + list_for_each_safe(le, lh, &shost->my_devices) { + sdev = list_entry(le, struct scsi_device, siblings); + + scsi_remove_device(sdev); + } } /* diff -Nru a/drivers/scsi/scsi_syms.c b/drivers/scsi/scsi_syms.c --- a/drivers/scsi/scsi_syms.c Thu Feb 27 01:44:23 2003 +++ b/drivers/scsi/scsi_syms.c Thu Feb 27 01:44:23 2003 @@ -78,6 +78,8 @@ EXPORT_SYMBOL(scsi_slave_detach); EXPORT_SYMBOL(scsi_device_get); EXPORT_SYMBOL(scsi_device_put); +EXPORT_SYMBOL(scsi_add_device); +EXPORT_SYMBOL(scsi_remove_device); EXPORT_SYMBOL(scsi_set_device_offline); /* diff -Nru a/drivers/scsi/sd.c b/drivers/scsi/sd.c --- a/drivers/scsi/sd.c Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/sd.c Thu Feb 27 01:44:27 2003 @@ -678,7 +678,7 @@ */ /* An error occurred */ - if (driver_byte(result) != 0 && /* An error occured */ + if (driver_byte(result) != 0 && /* An error occurred */ SCpnt->sense_buffer[0] == 0xF0) { /* Sense data is valid */ switch (SCpnt->sense_buffer[2]) { case MEDIUM_ERROR: @@ -719,7 +719,7 @@ case RECOVERED_ERROR: /* - * An error occured, but it recovered. Inform the + * An error occurred, but it recovered. Inform the * user, but make sure that it's not treated as a * hard error. */ diff -Nru a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c --- a/drivers/scsi/seagate.c Thu Feb 27 01:44:22 2003 +++ b/drivers/scsi/seagate.c Thu Feb 27 01:44:22 2003 @@ -493,7 +493,7 @@ /* * At all times, we will use IRQ 5. Should also check for IRQ3 - * if we loose our first interrupt. + * if we lose our first interrupt. */ instance = scsi_register (tpnt, 0); if (instance == NULL) diff -Nru a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c --- a/drivers/scsi/sgiwd93.c Thu Feb 27 01:44:30 2003 +++ b/drivers/scsi/sgiwd93.c Thu Feb 27 01:44:30 2003 @@ -4,10 +4,13 @@ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * 1999 Andrew R. Baker (andrewb@uab.edu) * - Support for 2nd SCSI controller on Indigo2 + * 2001 Florian Lohoff (flo@rfc822.org) + * - Delete HPC scatter gather (Read corruption on + * multiple disks) + * - Cleanup wback cache handling * * (In all truth, Jed Schimmel wrote all this code.) * - * $Id: sgiwd93.c,v 1.19 2000/02/04 07:40:47 ralf Exp $ */ #include #include @@ -36,32 +39,13 @@ struct hpc_chunk { struct hpc_dma_desc desc; - unsigned long padding; + u32 _padding; /* align to quadword boundary */ }; struct Scsi_Host *sgiwd93_host = NULL; struct Scsi_Host *sgiwd93_host1 = NULL; /* Wuff wuff, wuff, wd33c93.c, wuff wuff, object oriented, bow wow. */ -static inline void write_wd33c93_count(const wd33c93_regs regs, - unsigned long value) -{ - *regs.SASR = WD_TRANSFER_COUNT_MSB; - *regs.SCMD = ((value >> 16) & 0xff); - *regs.SCMD = ((value >> 8) & 0xff); - *regs.SCMD = ((value >> 0) & 0xff); -} - -static inline unsigned long read_wd33c93_count(const wd33c93_regs regs) -{ - unsigned long value; - - *regs.SASR = WD_TRANSFER_COUNT_MSB; - value = (*regs.SCMD << 16); - value |= (*regs.SCMD << 8); - value |= (*regs.SCMD << 0); - return value; -} /* XXX woof! */ static void sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs) @@ -82,7 +66,6 @@ unsigned long physaddr; unsigned long count; - dma_cache_wback_inv((unsigned long)addr,len); physaddr = PHYSADDR(addr); while (len) { /* @@ -101,7 +84,6 @@ static int dma_setup(Scsi_Cmnd *cmd, int datainp) { struct WD33C93_hostdata *hdata = (struct WD33C93_hostdata *)cmd->host->hostdata; - const wd33c93_regs regs = hdata->regs; struct hpc3_scsiregs *hregs = (struct hpc3_scsiregs *) cmd->host->base; struct hpc_chunk *hcp = (struct hpc_chunk *) hdata->dma_bounce_buffer; @@ -112,46 +94,17 @@ hdata->dma_dir = datainp; - if(cmd->SCp.buffers_residual) { - struct scatterlist *slp = cmd->SCp.buffer; - int i, totlen = 0; + /* + * wd33c93 shouldn't pass us bogus dma_setups, but + * it does:-( The other wd33c93 drivers deal with + * it the same way (which isn't that obvious). + * IMHO a better fix would be, not to do these + * dma setups in the first place + */ + if (cmd->SCp.ptr == NULL) + return 1; -#ifdef DEBUG_DMA - printk("SCLIST<"); -#endif - for(i = 0; i <= cmd->SCp.buffers_residual; i++) { -#ifdef DEBUG_DMA - printk("[%p,%d]", - page_address(slp[i].page) + slp[i].offset, - slp[i].length); -#endif - fill_hpc_entries (&hcp, - page_address(slp[i].page) + slp[i].offset, - slp[i].length); - totlen += slp[i].length; - } -#ifdef DEBUG_DMA - printk(">tlen<%d>", totlen); -#endif - hdata->dma_bounce_len = totlen; /* a trick... */ - write_wd33c93_count(regs, totlen); - } else { - /* Non-scattered dma. */ -#ifdef DEBUG_DMA - printk("ONEBUF<%p,%d>", cmd->SCp.ptr, cmd->SCp.this_residual); -#endif - /* - * wd33c93 shouldn't pass us bogus dma_setups, but - * it does:-( The other wd33c93 drivers deal with - * it the same way (which isn't that obvious). - * IMHO a better fix would be, not to do these - * dma setups in the first place - */ - if (cmd->SCp.ptr == NULL) - return 1; - fill_hpc_entries (&hcp, cmd->SCp.ptr,cmd->SCp.this_residual); - write_wd33c93_count(regs, cmd->SCp.this_residual); - } + fill_hpc_entries (&hcp, cmd->SCp.ptr,cmd->SCp.this_residual); /* To make sure, if we trip an HPC bug, that we transfer * every single byte, we tag on an extra zero length dma @@ -166,10 +119,14 @@ /* Start up the HPC. */ hregs->ndptr = PHYSADDR(hdata->dma_bounce_buffer); - if(datainp) + if(datainp) { + dma_cache_inv((unsigned long) cmd->SCp.ptr, cmd->SCp.this_residual); hregs->ctrl = (HPC3_SCTRL_ACTIVE); - else + } else { + dma_cache_wback_inv((unsigned long) cmd->SCp.ptr, cmd->SCp.this_residual); hregs->ctrl = (HPC3_SCTRL_ACTIVE | HPC3_SCTRL_DIR); + } + return 0; } @@ -177,7 +134,6 @@ int status) { struct WD33C93_hostdata *hdata = (struct WD33C93_hostdata *)instance->hostdata; - const wd33c93_regs regs = hdata->regs; struct hpc3_scsiregs *hregs; if (!SCpnt) @@ -197,44 +153,6 @@ } hregs->ctrl = 0; - /* See how far we got and update scatterlist state if necessary. */ - if(SCpnt->SCp.buffers_residual) { - struct scatterlist *slp = SCpnt->SCp.buffer; - int totlen, wd93_residual, transferred, i; - - /* Yep, we were doing the scatterlist thang. */ - totlen = hdata->dma_bounce_len; - wd93_residual = read_wd33c93_count(regs); - transferred = totlen - wd93_residual; - -#ifdef DEBUG_DMA - printk("tlen<%d>resid<%d>transf<%d> ", - totlen, wd93_residual, transferred); -#endif - - /* Avoid long winded partial-transfer search for common case. */ - if(transferred != totlen) { - /* This is the nut case. */ -#ifdef DEBUG_DMA - printk("Jed was here..."); -#endif - for(i = 0; i <= SCpnt->SCp.buffers_residual; i++) { - if(slp[i].length >= transferred) - break; - transferred -= slp[i].length; - } - } else { - /* This is the common case. */ -#ifdef DEBUG_DMA - printk("did it all..."); -#endif - i = SCpnt->SCp.buffers_residual; - } - SCpnt->SCp.buffer = &slp[i]; - SCpnt->SCp.buffers_residual = SCpnt->SCp.buffers_residual - i; - SCpnt->SCp.ptr = (char *) page_address(slp[i].page) + slp[i].offset; - SCpnt->SCp.this_residual = slp[i].length; - } #ifdef DEBUG_DMA printk("\n"); #endif @@ -264,6 +182,9 @@ }; hcp--; hcp->desc.pnext = PHYSADDR(buf); + + /* Force flush to memory */ + dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE); } int __init sgiwd93_detect(Scsi_Host_Template *SGIblows) @@ -273,8 +194,8 @@ struct hpc3_scsiregs *hregs1 = &hpc3c0->scsi_chan1; struct WD33C93_hostdata *hdata; struct WD33C93_hostdata *hdata1; - uchar *buf; wd33c93_regs regs; + uchar *buf; if(called) return 0; /* Should bitch on the console about this... */ @@ -294,10 +215,10 @@ return 0; } init_hpc_chain(buf); - dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE); + /* HPC_SCSI_REG0 | 0x03 | KSEG1 */ - regs.SASR = (volatile unsigned char *)KSEG1ADDR (0x1fbc0003); - regs.SCMD = (volatile unsigned char *)KSEG1ADDR (0x1fbc0007); + regs.SASR = (unsigned char*) KSEG1ADDR (0x1fbc0003); + regs.SCMD = (unsigned char*) KSEG1ADDR (0x1fbc0007); wd33c93_init(sgiwd93_host, regs, dma_setup, dma_stop, WD33C93_FS_16_20); hdata = (struct WD33C93_hostdata *)sgiwd93_host->hostdata; @@ -329,17 +250,16 @@ return 1; /* We registered host0 so return success*/ } init_hpc_chain(buf); - dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE); + /* HPC_SCSI_REG1 | 0x03 | KSEG1 */ - regs.SASR = (volatile unsigned char *)KSEG1ADDR (0x1fbc8003); - regs.SCMD = (volatile unsigned char *)KSEG1ADDR (0x1fbc8007); + regs.SASR = (unsigned char*) KSEG1ADDR(0x1fbc8003); + regs.SCMD = (unsigned char*) KSEG1ADDR(0x1fbc8007); wd33c93_init(sgiwd93_host1, regs, dma_setup, dma_stop, - WD33C93_FS_16_20); + WD33C93_FS_16_20); hdata1 = (struct WD33C93_hostdata *)sgiwd93_host1->hostdata; hdata1->no_sync = 0; hdata1->dma_bounce_buffer = (uchar *) (KSEG1ADDR(buf)); - dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE); if (request_irq(SGI_WD93_1_IRQ, sgiwd93_intr, 0, "SGI WD93", (void *) sgiwd93_host1)) { printk(KERN_WARNING "sgiwd93: Could not allocate irq %d (for host1).\n", SGI_WD93_1_IRQ); diff -Nru a/drivers/scsi/sr.c b/drivers/scsi/sr.c --- a/drivers/scsi/sr.c Thu Feb 27 01:44:20 2003 +++ b/drivers/scsi/sr.c Thu Feb 27 01:44:20 2003 @@ -26,7 +26,7 @@ * Modified by Richard Gooch to support devfs * * Modified by Jens Axboe - support DVD-RAM - * transparently and loose the GHOST hack + * transparently and lose the GHOST hack * * Modified by Arnaldo Carvalho de Melo * check resource allocation in sr_init and some cleanups diff -Nru a/drivers/scsi/st.c b/drivers/scsi/st.c --- a/drivers/scsi/st.c Thu Feb 27 01:44:25 2003 +++ b/drivers/scsi/st.c Thu Feb 27 01:44:25 2003 @@ -2963,7 +2963,7 @@ set the size of partition 1. There is no size field for the default partition. Michael Schaefer's Sony SDT-7000 returns two descriptors and the second is used to set the size of partition 1 (this is what the SCSI-3 standard specifies). - The following algorithm is used to accomodate both drives: if the number of + The following algorithm is used to accommodate both drives: if the number of partition size fields is greater than the maximum number of additional partitions in the mode page, the second field is used. Otherwise the first field is used. diff -Nru a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c --- a/drivers/scsi/sun3_NCR5380.c Thu Feb 27 01:44:18 2003 +++ b/drivers/scsi/sun3_NCR5380.c Thu Feb 27 01:44:18 2003 @@ -2564,7 +2564,7 @@ msg[0] = NCR5380_read(CURRENT_SCSI_DATA_REG); #endif - if (!msg[0] & 0x80) { + if (!(msg[0] & 0x80)) { printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO); print_msg(msg); do_abort(instance); @@ -2970,7 +2970,7 @@ * on any queue, so they won't be retried ... * * Conclusion: either scsi.c disables timeout for all resetted commands - * immediately, or we loose! As of linux-2.0.20 it doesn't. + * immediately, or we lose! As of linux-2.0.20 it doesn't. */ /* After the reset, there are no more connected or disconnected commands diff -Nru a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c --- a/drivers/scsi/sun3_scsi.c Thu Feb 27 01:44:18 2003 +++ b/drivers/scsi/sun3_scsi.c Thu Feb 27 01:44:18 2003 @@ -543,7 +543,7 @@ #if 1 // check to empty the fifo on a read if(!write_flag) { - int tmo = 200000; /* 2 sec */ + int tmo = 20000; /* .2 sec */ while(1) { if(dregs->csr & CSR_FIFO_EMPTY) diff -Nru a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c --- a/drivers/scsi/sym53c416.c Thu Feb 27 01:44:19 2003 +++ b/drivers/scsi/sym53c416.c Thu Feb 27 01:44:19 2003 @@ -679,7 +679,7 @@ printk(KERN_WARNING "sym53c416: unable to attach PnP device.\n"); continue; } - if(pnp_activate_dev(idev, NULL)<0) + if(pnp_activate_dev(idev) < 0) { printk(KERN_WARNING "sym53c416: unable to activate PnP device.\n"); pnp_device_detach(idev); diff -Nru a/drivers/scsi/sym53c8xx.c b/drivers/scsi/sym53c8xx.c --- a/drivers/scsi/sym53c8xx.c Thu Feb 27 01:44:26 2003 +++ b/drivers/scsi/sym53c8xx.c Thu Feb 27 01:44:26 2003 @@ -2677,7 +2677,7 @@ /* ** Now there are 4 possibilities: ** - ** (1) The ncr looses arbitration. + ** (1) The ncr loses arbitration. ** This is ok, because it will try again, ** when the bus becomes idle. ** (But beware of the timeout function!) @@ -3653,7 +3653,7 @@ ** some target to reset or some disconnected ** job to abort. Since error recovery is a serious ** busyness, we will really reset the SCSI BUS, if - ** case of a SCSI interrupt occuring in this path. + ** case of a SCSI interrupt occurring in this path. */ /* @@ -4631,7 +4631,7 @@ case 0x8: /* ** JUMP / CALL - ** dont't relocate if relative :-) + ** don't relocate if relative :-) */ if (opcode & 0x00800000) relocs = 0; @@ -6984,7 +6984,7 @@ INW (nc_sist); } else if (istat & DIP) { - if (INB (nc_dstat) & ABRT); + if (INB (nc_dstat) & ABRT) break; } UDELAY(5); @@ -7953,7 +7953,7 @@ /* ** Why not to try the immediate lower divisor and to choose ** the one that allows the fastest output speed ? - ** We dont want input speed too much greater than output speed. + ** We don't want input speed too much greater than output speed. */ if (div >= 1 && fak < 8) { u_long fak2, per2; @@ -9092,7 +9092,7 @@ ccb_p cp = ncr_ccb_from_dsa(np, dsa); /* - * Fix Up. Some disks respond to a PPR negotation with + * Fix Up. Some disks respond to a PPR negotiation with * a bus free instead of a message reject. * Disable ppr negotiation if this is first time * tried ppr negotiation. diff -Nru a/drivers/scsi/sym53c8xx_2/sym_conf.h b/drivers/scsi/sym53c8xx_2/sym_conf.h --- a/drivers/scsi/sym53c8xx_2/sym_conf.h Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/sym53c8xx_2/sym_conf.h Thu Feb 27 01:44:27 2003 @@ -244,7 +244,7 @@ * But for HVD/SE only capable chips (825a, 875, 885), * the driver uses some heuristic to probe against HVD. * Normally, the chip senses the DIFFSENS signal and - * should switch its BUS tranceivers to high impedance + * should switch its BUS transceivers to high impedance * in situation of the driver having been wrong about * the actual BUS mode. May-be, the BUS mode probing of * the driver is safe, but, given that it may be partially diff -Nru a/drivers/scsi/sym53c8xx_2/sym_fw.c b/drivers/scsi/sym53c8xx_2/sym_fw.c --- a/drivers/scsi/sym53c8xx_2/sym_fw.c Thu Feb 27 01:44:30 2003 +++ b/drivers/scsi/sym53c8xx_2/sym_fw.c Thu Feb 27 01:44:30 2003 @@ -539,7 +539,7 @@ case 0x8: /* * JUMP / CALL - * dont't relocate if relative :-) + * don't relocate if relative :-) */ if (opcode & 0x00800000) relocs = 0; diff -Nru a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h --- a/drivers/scsi/sym53c8xx_2/sym_fw1.h Thu Feb 27 01:44:27 2003 +++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h Thu Feb 27 01:44:27 2003 @@ -340,7 +340,7 @@ /* * Now there are 4 possibilities: * - * (1) The chip looses arbitration. + * (1) The chip loses arbitration. * This is ok, because it will try again, * when the bus becomes idle. * (But beware of the timeout function!) @@ -1361,7 +1361,7 @@ * some target to reset or some disconnected * job to abort. Since error recovery is a serious * busyness, we will really reset the SCSI BUS, if - * case of a SCSI interrupt occuring in this path. + * case of a SCSI interrupt occurring in this path. */ #ifdef SYM_CONF_TARGET_ROLE_SUPPORT diff -Nru a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h --- a/drivers/scsi/sym53c8xx_2/sym_fw2.h Thu Feb 27 01:44:28 2003 +++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h Thu Feb 27 01:44:28 2003 @@ -320,7 +320,7 @@ /* * Now there are 4 possibilities: * - * (1) The chip looses arbitration. + * (1) The chip loses arbitration. * This is ok, because it will try again, * when the bus becomes idle. * (But beware of the timeout function!) @@ -1246,7 +1246,7 @@ * some target to reset or some disconnected * job to abort. Since error recovery is a serious * busyness, we will really reset the SCSI BUS, if - * case of a SCSI interrupt occuring in this path. + * case of a SCSI interrupt occurring in this path. */ #ifdef SYM_CONF_TARGET_ROLE_SUPPORT /* diff -Nru a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c --- a/drivers/scsi/sym53c8xx_2/sym_glue.c Thu Feb 27 01:44:31 2003 +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c Thu Feb 27 01:44:31 2003 @@ -125,7 +125,7 @@ * * The whole SCSI sub-system under Linux is basically single-threaded. * Everything, including low-level driver interrupt routine, happens - * whith the `io_request_lock' held. + * with the `io_request_lock' held. * The sym53c8xx-1.x drivers series ran their interrupt code using a * spin mutex per controller. This added complexity without improving * scalability significantly. the sym-2 driver still use a spinlock diff -Nru a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c Thu Feb 27 01:44:16 2003 +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c Thu Feb 27 01:44:16 2003 @@ -234,7 +234,7 @@ INW (nc_sist); } else if (istat & DIP) { - if (INB (nc_dstat) & ABRT); + if (INB (nc_dstat) & ABRT) break; } UDELAY(5); diff -Nru a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c --- a/drivers/scsi/wd33c93.c Thu Feb 27 01:44:26 2003 +++ b/drivers/scsi/wd33c93.c Thu Feb 27 01:44:26 2003 @@ -1,7 +1,4 @@ /* - * wd33c93.c - Linux-68k device driver for the Commodore - * Amiga A2091/590 SCSI controller card - * * Copyright (c) 1996 John Shifflett, GeoLog Consulting * john@geolog.com * jshiffle@netcom.com @@ -15,8 +12,9 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * + */ + +/* * Drew Eckhardt's excellent 'Generic NCR5380' sources from Linux-PC * provided much of the inspiration and some of the code for this * driver. Everything I know about Amiga DMA was gleaned from careful @@ -76,38 +74,26 @@ #include #include -#include #include #include #include #include #include -#include #include +#include #include "scsi.h" #include "hosts.h" - -#define WD33C93_VERSION "1.25" -#define WD33C93_DATE "09/Jul/1997" -/* NOTE: 1.25 for m68k is related to in2000-1.31 for x86 */ - -/* - * Note - the following defines have been moved to 'wd33c93.h': - * - * PROC_INTERFACE - * PROC_STATISTICS - * SYNC_DEBUG - * DEBUGGING_ON - * DEBUG_DEFAULTS - * - */ - - #include "wd33c93.h" +#define WD33C93_VERSION "1.26" +#define WD33C93_DATE "22/Feb/2003" + +MODULE_AUTHOR("John Shifflett"); +MODULE_DESCRIPTION("Generic WD33C93 SCSI driver"); +MODULE_LICENSE("GPL"); /* * 'setup_strings' is a single string used to pass operating parameters and @@ -163,172 +149,223 @@ */ /* Normally, no defaults are specified */ -static char *setup_args[] = - {"","","","","","","","",""}; - -/* filled in by 'insmod' */ -static char *setup_strings = 0; +static char *setup_args[] = { "", "", "", "", "", "", "", "", "" }; -#ifdef MODULE_PARM +static char *setup_strings; MODULE_PARM(setup_strings, "s"); -#endif - +static void wd33c93_execute(struct Scsi_Host *instance); -static inline uchar read_wd33c93(const wd33c93_regs regs, uchar reg_num) +#ifdef CONFIG_WD33C93_PIO +static inline uchar +read_wd33c93(const wd33c93_regs regs, uchar reg_num) { - *regs.SASR = reg_num; - mb(); - return(*regs.SCMD); + uchar data; + + outb(reg_num, *regs.SASR); + data = inb(*regs.SCMD); + return data; } +static inline unsigned long +read_wd33c93_count(const wd33c93_regs regs) +{ + unsigned long value; -#define READ_AUX_STAT() (*regs.SASR) + outb(WD_TRANSFER_COUNT_MSB, *regs.SASR); + value = inb(*regs.SCMD) << 16; + value |= inb(*regs.SCMD) << 8; + value |= inb(*regs.SCMD); + return value; +} +static inline uchar +read_aux_stat(const wd33c93_regs regs) +{ + return inb(*regs.SASR); +} + +static inline void +write_wd33c93(const wd33c93_regs regs, uchar reg_num, uchar value) +{ + outb(reg_num, *regs.SASR); + outb(value, *regs.SCMD); +} -static inline void write_wd33c93(const wd33c93_regs regs, uchar reg_num, - uchar value) +static inline void +write_wd33c93_count(const wd33c93_regs regs, unsigned long value) { - *regs.SASR = reg_num; - mb(); - *regs.SCMD = value; - mb(); + outb(WD_TRANSFER_COUNT_MSB, *regs.SASR); + outb((value >> 16) & 0xff, *regs.SCMD); + outb((value >> 8) & 0xff, *regs.SCMD); + outb( value & 0xff, *regs.SCMD); } +#define write_wd33c93_cmd(regs, cmd) \ + write_wd33c93((regs), WD_COMMAND, (cmd)) -static inline void write_wd33c93_cmd(const wd33c93_regs regs, uchar cmd) +static inline void +write_wd33c93_cdb(const wd33c93_regs regs, uint len, uchar cmnd[]) { - *regs.SASR = WD_COMMAND; - mb(); - *regs.SCMD = cmd; - mb(); + int i; + + outb(WD_CDB_1, *regs.SASR); + for (i=0; i> 16; - *regs.SCMD = value >> 8; - *regs.SCMD = value; - mb(); + *regs.SASR = reg_num; + mb(); + *regs.SCMD = value; + mb(); } +static void +write_wd33c93_count(const wd33c93_regs regs, unsigned long value) +{ + *regs.SASR = WD_TRANSFER_COUNT_MSB; + mb(); + *regs.SCMD = value >> 16; + *regs.SCMD = value >> 8; + *regs.SCMD = value; + mb(); +} -static unsigned long read_wd33c93_count(const wd33c93_regs regs) +static inline void +write_wd33c93_cmd(const wd33c93_regs regs, uchar cmd) { -unsigned long value; + *regs.SASR = WD_COMMAND; + mb(); + *regs.SCMD = cmd; + mb(); +} + +static inline void +write_wd33c93_cdb(const wd33c93_regs regs, uint len, uchar cmnd[]) +{ + int i; - *regs.SASR = WD_TRANSFER_COUNT_MSB; - mb(); - value = *regs.SCMD << 16; - value |= *regs.SCMD << 8; - value |= *regs.SCMD; - mb(); - return value; + *regs.SASR = WD_CDB_1; + for (i = 0; i < len; i++) + *regs.SCMD = cmnd[i]; } +#endif /* CONFIG_WD33C93_PIO */ +static inline uchar +read_1_byte(const wd33c93_regs regs) +{ + uchar asr; + uchar x = 0; + + write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); + write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO | 0x80); + do { + asr = read_aux_stat(regs); + if (asr & ASR_DBR) + x = read_wd33c93(regs, WD_DATA); + } while (!(asr & ASR_INT)); + return x; +} /* The 33c93 needs to be told which direction a command transfers its * data; we use this function to figure it out. Returns true if there * will be a DATA_OUT phase with this command, false otherwise. * (Thanks to Joerg Dorchain for the research and suggestion.) */ -static int is_dir_out(Scsi_Cmnd *cmd) +static inline int +is_dir_out(Scsi_Cmnd * cmd) { - switch (cmd->cmnd[0]) { - case WRITE_6: case WRITE_10: case WRITE_12: - case WRITE_LONG: case WRITE_SAME: case WRITE_BUFFER: - case WRITE_VERIFY: case WRITE_VERIFY_12: - case COMPARE: case COPY: case COPY_VERIFY: - case SEARCH_EQUAL: case SEARCH_HIGH: case SEARCH_LOW: - case SEARCH_EQUAL_12: case SEARCH_HIGH_12: case SEARCH_LOW_12: - case FORMAT_UNIT: case REASSIGN_BLOCKS: case RESERVE: - case MODE_SELECT: case MODE_SELECT_10: case LOG_SELECT: - case SEND_DIAGNOSTIC: case CHANGE_DEFINITION: case UPDATE_BLOCK: - case SET_WINDOW: case MEDIUM_SCAN: case SEND_VOLUME_TAG: - case 0xea: - return 1; - default: - return 0; - } + return cmd->sc_data_direction == SCSI_DATA_WRITE; } +static struct sx_period sx_table[] = { + {1, 0x20}, + {252, 0x20}, + {376, 0x30}, + {500, 0x40}, + {624, 0x50}, + {752, 0x60}, + {876, 0x70}, + {1000, 0x00}, + {0, 0} +}; +static int +round_period(unsigned int period) +{ + int x; -static struct sx_period sx_table[] = { - { 1, 0x20}, - {252, 0x20}, - {376, 0x30}, - {500, 0x40}, - {624, 0x50}, - {752, 0x60}, - {876, 0x70}, - {1000,0x00}, - {0, 0} }; - -static int round_period(unsigned int period) -{ -int x; - - for (x=1; sx_table[x].period_ns; x++) { - if ((period <= sx_table[x-0].period_ns) && - (period > sx_table[x-1].period_ns)) { - return x; - } - } - return 7; -} - -static uchar calc_sync_xfer(unsigned int period, unsigned int offset) -{ -uchar result; - - period *= 4; /* convert SDTR code to ns */ - result = sx_table[round_period(period)].reg_value; - result |= (offset < OPTIMUM_SX_OFF)?offset:OPTIMUM_SX_OFF; - return result; + for (x = 1; sx_table[x].period_ns; x++) { + if ((period <= sx_table[x - 0].period_ns) && + (period > sx_table[x - 1].period_ns)) { + return x; + } + } + return 7; } +static uchar +calc_sync_xfer(unsigned int period, unsigned int offset) +{ + uchar result; + period *= 4; /* convert SDTR code to ns */ + result = sx_table[round_period(period)].reg_value; + result |= (offset < OPTIMUM_SX_OFF) ? offset : OPTIMUM_SX_OFF; + return result; +} -static void wd33c93_execute(struct Scsi_Host *instance); - -int wd33c93_queuecommand (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) +int +wd33c93_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) { - struct WD33C93_hostdata *hostdata; - Scsi_Cmnd *tmp; + struct WD33C93_hostdata *hostdata; + Scsi_Cmnd *tmp; - hostdata = (struct WD33C93_hostdata *)cmd->host->hostdata; + hostdata = (struct WD33C93_hostdata *) cmd->device->host->hostdata; -DB(DB_QUEUE_COMMAND,printk("Q-%d-%02x-%ld( ",cmd->target,cmd->cmnd[0],cmd->pid)) + DB(DB_QUEUE_COMMAND, + printk("Q-%d-%02x-%ld( ", cmd->device->id, cmd->cmnd[0], cmd->pid)) /* Set up a few fields in the Scsi_Cmnd structure for our own use: * - host_scribble is the pointer to the next cmd in the input queue * - scsi_done points to the routine we call when a cmd is finished * - result is what you'd expect */ - - cmd->host_scribble = NULL; - cmd->scsi_done = done; - cmd->result = 0; + cmd->host_scribble = NULL; + cmd->scsi_done = done; + cmd->result = 0; /* We use the Scsi_Pointer structure that's included with each command * as a scratchpad (as it's intended to be used!). The handy thing about @@ -345,19 +382,18 @@ * - SCp.phase records this command's SRCID_ER bit setting */ - if (cmd->use_sg) { - cmd->SCp.buffer = (struct scatterlist *)cmd->buffer; - cmd->SCp.buffers_residual = cmd->use_sg - 1; - cmd->SCp.ptr = page_address(cmd->SCp.buffer->page)+ - cmd->SCp.buffer->offset; - cmd->SCp.this_residual = cmd->SCp.buffer->length; - } - else { - cmd->SCp.buffer = NULL; - cmd->SCp.buffers_residual = 0; - cmd->SCp.ptr = (char *)cmd->request_buffer; - cmd->SCp.this_residual = cmd->request_bufflen; - } + if (cmd->use_sg) { + cmd->SCp.buffer = (struct scatterlist *) cmd->buffer; + cmd->SCp.buffers_residual = cmd->use_sg - 1; + cmd->SCp.ptr = page_address(cmd->SCp.buffer->page) + + cmd->SCp.buffer->offset; + cmd->SCp.this_residual = cmd->SCp.buffer->length; + } else { + cmd->SCp.buffer = NULL; + cmd->SCp.buffers_residual = 0; + cmd->SCp.ptr = (char *) cmd->request_buffer; + cmd->SCp.this_residual = cmd->request_bufflen; + } /* WD docs state that at the conclusion of a "LEVEL2" command, the * status byte can be retrieved from the LUN register. Apparently, @@ -376,41 +412,37 @@ * status byte is stored. */ - cmd->SCp.Status = ILLEGAL_STATUS_BYTE; + cmd->SCp.Status = ILLEGAL_STATUS_BYTE; - /* - * Add the cmd to the end of 'input_Q'. Note that REQUEST SENSE - * commands are added to the head of the queue so that the desired - * sense data is not lost before REQUEST_SENSE executes. - */ - - spin_lock_irq(&hostdata->lock); - - if (!(hostdata->input_Q) || (cmd->cmnd[0] == REQUEST_SENSE)) { - cmd->host_scribble = (uchar *)hostdata->input_Q; - hostdata->input_Q = cmd; - } - else { /* find the end of the queue */ - for (tmp=(Scsi_Cmnd *)hostdata->input_Q; tmp->host_scribble; - tmp=(Scsi_Cmnd *)tmp->host_scribble) - ; - tmp->host_scribble = (uchar *)cmd; - } + /* + * Add the cmd to the end of 'input_Q'. Note that REQUEST SENSE + * commands are added to the head of the queue so that the desired + * sense data is not lost before REQUEST_SENSE executes. + */ + + spin_lock_irq(&hostdata->lock); + + if (!(hostdata->input_Q) || (cmd->cmnd[0] == REQUEST_SENSE)) { + cmd->host_scribble = (uchar *) hostdata->input_Q; + hostdata->input_Q = cmd; + } else { /* find the end of the queue */ + for (tmp = (Scsi_Cmnd *) hostdata->input_Q; tmp->host_scribble; + tmp = (Scsi_Cmnd *) tmp->host_scribble) ; + tmp->host_scribble = (uchar *) cmd; + } /* We know that there's at least one command in 'input_Q' now. * Go see if any of them are runnable! */ - wd33c93_execute(cmd->host); + wd33c93_execute(cmd->device->host); -DB(DB_QUEUE_COMMAND,printk(")Q-%ld ",cmd->pid)) + DB(DB_QUEUE_COMMAND, printk(")Q-%ld ", cmd->pid)) - spin_unlock_irq(&hostdata->lock); - return 0; + spin_unlock_irq(&hostdata->lock); + return 0; } - - /* * This routine attempts to start a scsi command. If the host_card is * already connected, we give up immediately. Otherwise, look through @@ -421,64 +453,60 @@ * the wd33c93_intr itself, which means that a wd33c93 interrupt * cannot occur while we are in here. */ -static void wd33c93_execute (struct Scsi_Host *instance) +static void +wd33c93_execute(struct Scsi_Host *instance) { -struct WD33C93_hostdata *hostdata = (struct WD33C93_hostdata *)instance->hostdata; -const wd33c93_regs regs = hostdata->regs; -Scsi_Cmnd *cmd, *prev; -int i; - -DB(DB_EXECUTE,printk("EX(")) - - if (hostdata->selecting || hostdata->connected) { - -DB(DB_EXECUTE,printk(")EX-0 ")) - - return; - } - - /* - * Search through the input_Q for a command destined - * for an idle target/lun. - */ - - cmd = (Scsi_Cmnd *)hostdata->input_Q; - prev = 0; - while (cmd) { - if (!(hostdata->busy[cmd->target] & (1 << cmd->lun))) - break; - prev = cmd; - cmd = (Scsi_Cmnd *)cmd->host_scribble; - } - - /* quit if queue empty or all possible targets are busy */ - - if (!cmd) { - -DB(DB_EXECUTE,printk(")EX-1 ")) - - return; - } - - /* remove command from queue */ - - if (prev) - prev->host_scribble = cmd->host_scribble; - else - hostdata->input_Q = (Scsi_Cmnd *)cmd->host_scribble; + struct WD33C93_hostdata *hostdata = + (struct WD33C93_hostdata *) instance->hostdata; + const wd33c93_regs regs = hostdata->regs; + Scsi_Cmnd *cmd, *prev; + + DB(DB_EXECUTE, printk("EX(")) + if (hostdata->selecting || hostdata->connected) { + DB(DB_EXECUTE, printk(")EX-0 ")) + return; + } + + /* + * Search through the input_Q for a command destined + * for an idle target/lun. + */ + + cmd = (Scsi_Cmnd *) hostdata->input_Q; + prev = 0; + while (cmd) { + if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))) + break; + prev = cmd; + cmd = (Scsi_Cmnd *) cmd->host_scribble; + } + + /* quit if queue empty or all possible targets are busy */ + + if (!cmd) { + DB(DB_EXECUTE, printk(")EX-1 ")) + return; + } + + /* remove command from queue */ + + if (prev) + prev->host_scribble = cmd->host_scribble; + else + hostdata->input_Q = (Scsi_Cmnd *) cmd->host_scribble; #ifdef PROC_STATISTICS - hostdata->cmd_cnt[cmd->target]++; + hostdata->cmd_cnt[cmd->device->id]++; #endif - /* - * Start the selection process - */ - - if (is_dir_out(cmd)) - write_wd33c93(regs, WD_DESTINATION_ID, cmd->target); - else - write_wd33c93(regs, WD_DESTINATION_ID, cmd->target | DSTID_DPD); + /* + * Start the selection process + */ + + if (is_dir_out(cmd)) + write_wd33c93(regs, WD_DESTINATION_ID, cmd->device->id); + else + write_wd33c93(regs, WD_DESTINATION_ID, cmd->device->id | DSTID_DPD); /* Now we need to figure out whether or not this command is a good * candidate for disconnect/reselect. We guess to the best of our @@ -503,55 +531,58 @@ * to change around and experiment with for now. */ - cmd->SCp.phase = 0; /* assume no disconnect */ - if (hostdata->disconnect == DIS_NEVER) - goto no; - if (hostdata->disconnect == DIS_ALWAYS) - goto yes; - if (cmd->device->type == 1) /* tape drive? */ - goto yes; - if (hostdata->disconnected_Q) /* other commands disconnected? */ - goto yes; - if (!(hostdata->input_Q)) /* input_Q empty? */ - goto no; - for (prev=(Scsi_Cmnd *)hostdata->input_Q; prev; - prev=(Scsi_Cmnd *)prev->host_scribble) { - if ((prev->target != cmd->target) || (prev->lun != cmd->lun)) { - for (prev=(Scsi_Cmnd *)hostdata->input_Q; prev; - prev=(Scsi_Cmnd *)prev->host_scribble) - prev->SCp.phase = 1; - goto yes; - } - } - goto no; + cmd->SCp.phase = 0; /* assume no disconnect */ + if (hostdata->disconnect == DIS_NEVER) + goto no; + if (hostdata->disconnect == DIS_ALWAYS) + goto yes; + if (cmd->device->type == 1) /* tape drive? */ + goto yes; + if (hostdata->disconnected_Q) /* other commands disconnected? */ + goto yes; + if (!(hostdata->input_Q)) /* input_Q empty? */ + goto no; + for (prev = (Scsi_Cmnd *) hostdata->input_Q; prev; + prev = (Scsi_Cmnd *) prev->host_scribble) { + if ((prev->device->id != cmd->device->id) || + (prev->device->lun != cmd->device->lun)) { + for (prev = (Scsi_Cmnd *) hostdata->input_Q; prev; + prev = (Scsi_Cmnd *) prev->host_scribble) + prev->SCp.phase = 1; + goto yes; + } + } -yes: - cmd->SCp.phase = 1; + goto no; + + yes: + cmd->SCp.phase = 1; #ifdef PROC_STATISTICS - hostdata->disc_allowed_cnt[cmd->target]++; + hostdata->disc_allowed_cnt[cmd->device->id]++; #endif -no: + no: - write_wd33c93(regs, WD_SOURCE_ID, ((cmd->SCp.phase)?SRCID_ER:0)); + write_wd33c93(regs, WD_SOURCE_ID, ((cmd->SCp.phase) ? SRCID_ER : 0)); - write_wd33c93(regs, WD_TARGET_LUN, cmd->lun); - write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER,hostdata->sync_xfer[cmd->target]); - hostdata->busy[cmd->target] |= (1 << cmd->lun); - - if ((hostdata->level2 == L2_NONE) || - (hostdata->sync_stat[cmd->target] == SS_UNSET)) { - - /* - * Do a 'Select-With-ATN' command. This will end with - * one of the following interrupts: - * CSR_RESEL_AM: failure - can try again later. - * CSR_TIMEOUT: failure - give up. - * CSR_SELECT: success - proceed. - */ + write_wd33c93(regs, WD_TARGET_LUN, cmd->device->lun); + write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER, + hostdata->sync_xfer[cmd->device->id]); + hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun); + + if ((hostdata->level2 == L2_NONE) || + (hostdata->sync_stat[cmd->device->id] == SS_UNSET)) { + + /* + * Do a 'Select-With-ATN' command. This will end with + * one of the following interrupts: + * CSR_RESEL_AM: failure - can try again later. + * CSR_TIMEOUT: failure - give up. + * CSR_SELECT: success - proceed. + */ - hostdata->selecting = cmd; + hostdata->selecting = cmd; /* Every target has its own synchronous transfer setting, kept in the * sync_xfer array, and a corresponding status byte in sync_stat[]. @@ -565,119 +596,115 @@ * later, but at that time we'll negotiate for async by specifying a * sync fifo depth of 0. */ - if (hostdata->sync_stat[cmd->target] == SS_UNSET) - hostdata->sync_stat[cmd->target] = SS_FIRST; - hostdata->state = S_SELECTING; - write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */ - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN); - } - - else { - - /* - * Do a 'Select-With-ATN-Xfer' command. This will end with - * one of the following interrupts: - * CSR_RESEL_AM: failure - can try again later. - * CSR_TIMEOUT: failure - give up. - * anything else: success - proceed. - */ - - hostdata->connected = cmd; - write_wd33c93(regs, WD_COMMAND_PHASE, 0); - - /* copy command_descriptor_block into WD chip - * (take advantage of auto-incrementing) - */ - - *regs.SASR = WD_CDB_1; - for (i=0; icmd_len; i++) - *regs.SCMD = cmd->cmnd[i]; - - /* The wd33c93 only knows about Group 0, 1, and 5 commands when - * it's doing a 'select-and-transfer'. To be safe, we write the - * size of the CDB into the OWN_ID register for every case. This - * way there won't be problems with vendor-unique, audio, etc. - */ - - write_wd33c93(regs, WD_OWN_ID, cmd->cmd_len); - - /* When doing a non-disconnect command with DMA, we can save - * ourselves a DATA phase interrupt later by setting everything - * up ahead of time. - */ - - if ((cmd->SCp.phase == 0) && (hostdata->no_dma == 0)) { - if (hostdata->dma_setup(cmd, - (is_dir_out(cmd))?DATA_OUT_DIR:DATA_IN_DIR)) - write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */ - else { - write_wd33c93_count(regs, cmd->SCp.this_residual); - write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA); - hostdata->dma = D_DMA_RUNNING; - } - } - else - write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */ - - hostdata->state = S_RUNNING_LEVEL2; - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); - } - - /* - * Since the SCSI bus can handle only 1 connection at a time, - * we get out of here now. If the selection fails, or when - * the command disconnects, we'll come back to this routine - * to search the input_Q again... - */ - -DB(DB_EXECUTE,printk("%s%ld)EX-2 ",(cmd->SCp.phase)?"d:":"",cmd->pid)) -} - - - -static void transfer_pio(const wd33c93_regs regs, uchar *buf, int cnt, - int data_in_dir, struct WD33C93_hostdata *hostdata) -{ -uchar asr; - -DB(DB_TRANSFER,printk("(%p,%d,%s:",buf,cnt,data_in_dir?"in":"out")) - - write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); - write_wd33c93_count(regs, cnt); - write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO); - if (data_in_dir) { - do { - asr = READ_AUX_STAT(); - if (asr & ASR_DBR) - *buf++ = read_wd33c93(regs, WD_DATA); - } while (!(asr & ASR_INT)); - } - else { - do { - asr = READ_AUX_STAT(); - if (asr & ASR_DBR) - write_wd33c93(regs, WD_DATA, *buf++); - } while (!(asr & ASR_INT)); - } - - /* Note: we are returning with the interrupt UN-cleared. - * Since (presumably) an entire I/O operation has - * completed, the bus phase is probably different, and - * the interrupt routine will discover this when it - * responds to the uncleared int. - */ + if (hostdata->sync_stat[cmd->device->id] == SS_UNSET) + hostdata->sync_stat[cmd->device->id] = SS_FIRST; + hostdata->state = S_SELECTING; + write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */ + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN); + } else { + + /* + * Do a 'Select-With-ATN-Xfer' command. This will end with + * one of the following interrupts: + * CSR_RESEL_AM: failure - can try again later. + * CSR_TIMEOUT: failure - give up. + * anything else: success - proceed. + */ + + hostdata->connected = cmd; + write_wd33c93(regs, WD_COMMAND_PHASE, 0); + + /* copy command_descriptor_block into WD chip + * (take advantage of auto-incrementing) + */ + + write_wd33c93_cdb(regs, cmd->cmd_len, cmd->cmnd); + + /* The wd33c93 only knows about Group 0, 1, and 5 commands when + * it's doing a 'select-and-transfer'. To be safe, we write the + * size of the CDB into the OWN_ID register for every case. This + * way there won't be problems with vendor-unique, audio, etc. + */ + + write_wd33c93(regs, WD_OWN_ID, cmd->cmd_len); + + /* When doing a non-disconnect command with DMA, we can save + * ourselves a DATA phase interrupt later by setting everything + * up ahead of time. + */ + + if ((cmd->SCp.phase == 0) && (hostdata->no_dma == 0)) { + if (hostdata->dma_setup(cmd, + (is_dir_out(cmd)) ? DATA_OUT_DIR + : DATA_IN_DIR)) + write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */ + else { + write_wd33c93_count(regs, + cmd->SCp.this_residual); + write_wd33c93(regs, WD_CONTROL, + CTRL_IDI | CTRL_EDI | CTRL_DMA); + hostdata->dma = D_DMA_RUNNING; + } + } else + write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */ + + hostdata->state = S_RUNNING_LEVEL2; + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); + } + + /* + * Since the SCSI bus can handle only 1 connection at a time, + * we get out of here now. If the selection fails, or when + * the command disconnects, we'll come back to this routine + * to search the input_Q again... + */ + + DB(DB_EXECUTE, + printk("%s%ld)EX-2 ", (cmd->SCp.phase) ? "d:" : "", cmd->pid)) +} + +static void +transfer_pio(const wd33c93_regs regs, uchar * buf, int cnt, + int data_in_dir, struct WD33C93_hostdata *hostdata) +{ + uchar asr; + + DB(DB_TRANSFER, + printk("(%p,%d,%s:", buf, cnt, data_in_dir ? "in" : "out")) + + write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); + write_wd33c93_count(regs, cnt); + write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO); + if (data_in_dir) { + do { + asr = read_aux_stat(regs); + if (asr & ASR_DBR) + *buf++ = read_wd33c93(regs, WD_DATA); + } while (!(asr & ASR_INT)); + } else { + do { + asr = read_aux_stat(regs); + if (asr & ASR_DBR) + write_wd33c93(regs, WD_DATA, *buf++); + } while (!(asr & ASR_INT)); + } + + /* Note: we are returning with the interrupt UN-cleared. + * Since (presumably) an entire I/O operation has + * completed, the bus phase is probably different, and + * the interrupt routine will discover this when it + * responds to the uncleared int. + */ } - - -static void transfer_bytes(const wd33c93_regs regs, Scsi_Cmnd *cmd, - int data_in_dir) +static void +transfer_bytes(const wd33c93_regs regs, Scsi_Cmnd * cmd, int data_in_dir) { -struct WD33C93_hostdata *hostdata; -unsigned long length; + struct WD33C93_hostdata *hostdata; + unsigned long length; - hostdata = (struct WD33C93_hostdata *)cmd->host->hostdata; + hostdata = (struct WD33C93_hostdata *) cmd->device->host->hostdata; /* Normally, you'd expect 'this_residual' to be non-zero here. * In a series of scatter-gather transfers, however, this @@ -687,38 +714,31 @@ * now we need to setup the next scatter-gather buffer as the * source or destination for THIS transfer. */ - if (!cmd->SCp.this_residual && cmd->SCp.buffers_residual) { - ++cmd->SCp.buffer; - --cmd->SCp.buffers_residual; - cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr = page_address(cmd->SCp.buffer->page)+ - cmd->SCp.buffer->offset; - } + if (!cmd->SCp.this_residual && cmd->SCp.buffers_residual) { + ++cmd->SCp.buffer; + --cmd->SCp.buffers_residual; + cmd->SCp.this_residual = cmd->SCp.buffer->length; + cmd->SCp.ptr = page_address(cmd->SCp.buffer->page) + + cmd->SCp.buffer->offset; + } - write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER,hostdata->sync_xfer[cmd->target]); + write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER, + hostdata->sync_xfer[cmd->device->id]); /* 'hostdata->no_dma' is TRUE if we don't even want to try DMA. * Update 'this_residual' and 'ptr' after 'transfer_pio()' returns. */ - if (hostdata->no_dma) - goto use_transfer_pio; - -/* 'dma_setup()' will return TRUE if we can't do DMA. - * Update 'this_residual' and 'ptr' after 'transfer_pio()' returns. - */ - - else if (hostdata->dma_setup(cmd, data_in_dir)) { -use_transfer_pio: + if (hostdata->no_dma || hostdata->dma_setup(cmd, data_in_dir)) { #ifdef PROC_STATISTICS - hostdata->pio_cnt++; + hostdata->pio_cnt++; #endif - transfer_pio(regs, (uchar *)cmd->SCp.ptr, cmd->SCp.this_residual, - data_in_dir, hostdata); - length = cmd->SCp.this_residual; - cmd->SCp.this_residual = read_wd33c93_count(regs); - cmd->SCp.ptr += (length - cmd->SCp.this_residual); - } + transfer_pio(regs, (uchar *) cmd->SCp.ptr, + cmd->SCp.this_residual, data_in_dir, hostdata); + length = cmd->SCp.this_residual; + cmd->SCp.this_residual = read_wd33c93_count(regs); + cmd->SCp.ptr += (length - cmd->SCp.this_residual); + } /* We are able to do DMA (in fact, the Amiga hardware is * already going!), so start up the wd33c93 in DMA mode. @@ -729,51 +749,50 @@ * until then. */ - else { + else { #ifdef PROC_STATISTICS - hostdata->dma_cnt++; + hostdata->dma_cnt++; #endif - write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA); - write_wd33c93_count(regs, cmd->SCp.this_residual); - - if ((hostdata->level2 >= L2_DATA) || - (hostdata->level2 == L2_BASIC && cmd->SCp.phase == 0)) { - write_wd33c93(regs, WD_COMMAND_PHASE, 0x45); - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); - hostdata->state = S_RUNNING_LEVEL2; - } - else - write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO); + write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA); + write_wd33c93_count(regs, cmd->SCp.this_residual); - hostdata->dma = D_DMA_RUNNING; - } -} + if ((hostdata->level2 >= L2_DATA) || + (hostdata->level2 == L2_BASIC && cmd->SCp.phase == 0)) { + write_wd33c93(regs, WD_COMMAND_PHASE, 0x45); + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); + hostdata->state = S_RUNNING_LEVEL2; + } else + write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO); + + hostdata->dma = D_DMA_RUNNING; + } +} + +void +wd33c93_intr(struct Scsi_Host *instance) +{ + struct WD33C93_hostdata *hostdata = + (struct WD33C93_hostdata *) instance->hostdata; + const wd33c93_regs regs = hostdata->regs; + Scsi_Cmnd *patch, *cmd; + uchar asr, sr, phs, id, lun, *ucp, msg; + unsigned long length, flags; + + asr = read_aux_stat(regs); + if (!(asr & ASR_INT) || (asr & ASR_BSY)) + return; - - -void wd33c93_intr (struct Scsi_Host *instance) -{ -struct WD33C93_hostdata *hostdata = (struct WD33C93_hostdata *)instance->hostdata; -const wd33c93_regs regs = hostdata->regs; -Scsi_Cmnd *patch, *cmd; -uchar asr, sr, phs, id, lun, *ucp, msg; -unsigned long length, flags; - - asr = READ_AUX_STAT(); - if (!(asr & ASR_INT) || (asr & ASR_BSY)) - return; - - spin_lock_irqsave(&hostdata->lock, flags); + spin_lock_irqsave(&hostdata->lock, flags); #ifdef PROC_STATISTICS - hostdata->int_cnt++; + hostdata->int_cnt++; #endif - cmd = (Scsi_Cmnd *)hostdata->connected; /* assume we're connected */ - sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear the interrupt */ - phs = read_wd33c93(regs, WD_COMMAND_PHASE); + cmd = (Scsi_Cmnd *) hostdata->connected; /* assume we're connected */ + sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear the interrupt */ + phs = read_wd33c93(regs, WD_COMMAND_PHASE); -DB(DB_INTR,printk("{%02x:%02x-",asr,sr)) + DB(DB_INTR, printk("{%02x:%02x-", asr, sr)) /* After starting a DMA transfer, the next interrupt * is guaranteed to be in response to completion of @@ -789,76 +808,74 @@ * whatever is needed, we go on and service the WD3393 * interrupt normally. */ - - if (hostdata->dma == D_DMA_RUNNING) { -DB(DB_TRANSFER,printk("[%p/%d:",cmd->SCp.ptr,cmd->SCp.this_residual)) - hostdata->dma_stop(cmd->host, cmd, 1); - hostdata->dma = D_DMA_OFF; - length = cmd->SCp.this_residual; - cmd->SCp.this_residual = read_wd33c93_count(regs); - cmd->SCp.ptr += (length - cmd->SCp.this_residual); -DB(DB_TRANSFER,printk("%p/%d]",cmd->SCp.ptr,cmd->SCp.this_residual)) - } + if (hostdata->dma == D_DMA_RUNNING) { + DB(DB_TRANSFER, + printk("[%p/%d:", cmd->SCp.ptr, cmd->SCp.this_residual)) + hostdata->dma_stop(cmd->device->host, cmd, 1); + hostdata->dma = D_DMA_OFF; + length = cmd->SCp.this_residual; + cmd->SCp.this_residual = read_wd33c93_count(regs); + cmd->SCp.ptr += (length - cmd->SCp.this_residual); + DB(DB_TRANSFER, + printk("%p/%d]", cmd->SCp.ptr, cmd->SCp.this_residual)) + } /* Respond to the specific WD3393 interrupt - there are quite a few! */ + switch (sr) { + case CSR_TIMEOUT: + DB(DB_INTR, printk("TIMEOUT")) + + if (hostdata->state == S_RUNNING_LEVEL2) + hostdata->connected = NULL; + else { + cmd = (Scsi_Cmnd *) hostdata->selecting; /* get a valid cmd */ + hostdata->selecting = NULL; + } + + cmd->result = DID_NO_CONNECT << 16; + hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); + hostdata->state = S_UNCONNECTED; + cmd->scsi_done(cmd); + + /* From esp.c: + * There is a window of time within the scsi_done() path + * of execution where interrupts are turned back on full + * blast and left that way. During that time we could + * reconnect to a disconnected command, then we'd bomb + * out below. We could also end up executing two commands + * at _once_. ...just so you know why the restore_flags() + * is here... + */ - switch (sr) { - - case CSR_TIMEOUT: -DB(DB_INTR,printk("TIMEOUT")) - - if (hostdata->state == S_RUNNING_LEVEL2) - hostdata->connected = NULL; - else { - cmd = (Scsi_Cmnd *)hostdata->selecting; /* get a valid cmd */ - hostdata->selecting = NULL; - } - - cmd->result = DID_NO_CONNECT << 16; - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - hostdata->state = S_UNCONNECTED; - cmd->scsi_done(cmd); - - /* From esp.c: - * There is a window of time within the scsi_done() path - * of execution where interrupts are turned back on full - * blast and left that way. During that time we could - * reconnect to a disconnected command, then we'd bomb - * out below. We could also end up executing two commands - * at _once_. ...just so you know why the restore_flags() - * is here... - */ - - spin_unlock_irqrestore(&hostdata->lock, flags); + spin_unlock_irqrestore(&hostdata->lock, flags); /* We are not connected to a target - check to see if there * are commands waiting to be executed. */ - wd33c93_execute(instance); - break; - + wd33c93_execute(instance); + break; /* Note: this interrupt should not occur in a LEVEL2 command */ - case CSR_SELECT: - -DB(DB_INTR,printk("SELECT")) - hostdata->connected = cmd = (Scsi_Cmnd *)hostdata->selecting; - hostdata->selecting = NULL; + case CSR_SELECT: + DB(DB_INTR, printk("SELECT")) + hostdata->connected = cmd = + (Scsi_Cmnd *) hostdata->selecting; + hostdata->selecting = NULL; + + /* construct an IDENTIFY message with correct disconnect bit */ + + hostdata->outgoing_msg[0] = (0x80 | 0x00 | cmd->device->lun); + if (cmd->SCp.phase) + hostdata->outgoing_msg[0] |= 0x40; - /* construct an IDENTIFY message with correct disconnect bit */ - - hostdata->outgoing_msg[0] = (0x80 | 0x00 | cmd->lun); - if (cmd->SCp.phase) - hostdata->outgoing_msg[0] |= 0x40; - - if (hostdata->sync_stat[cmd->target] == SS_FIRST) { + if (hostdata->sync_stat[cmd->device->id] == SS_FIRST) { #ifdef SYNC_DEBUG -printk(" sending SDTR "); + printk(" sending SDTR "); #endif - hostdata->sync_stat[cmd->target] = SS_WAITING; + hostdata->sync_stat[cmd->device->id] = SS_WAITING; /* Tack on a 2nd message to ask about synchronous transfers. If we've * been asked to do only asynchronous transfers on this device, we @@ -866,158 +883,155 @@ * solve the problems some people have had with GVP's Guru ROM. */ - hostdata->outgoing_msg[1] = EXTENDED_MESSAGE; - hostdata->outgoing_msg[2] = 3; - hostdata->outgoing_msg[3] = EXTENDED_SDTR; - if (hostdata->no_sync & (1 << cmd->target)) { - hostdata->outgoing_msg[4] = hostdata->default_sx_per/4; - hostdata->outgoing_msg[5] = 0; - } - else { - hostdata->outgoing_msg[4] = OPTIMUM_SX_PER/4; - hostdata->outgoing_msg[5] = OPTIMUM_SX_OFF; - } - hostdata->outgoing_len = 6; - } - else - hostdata->outgoing_len = 1; - - hostdata->state = S_CONNECTED; - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - - case CSR_XFER_DONE|PHS_DATA_IN: - case CSR_UNEXP |PHS_DATA_IN: - case CSR_SRV_REQ |PHS_DATA_IN: -DB(DB_INTR,printk("IN-%d.%d",cmd->SCp.this_residual,cmd->SCp.buffers_residual)) - transfer_bytes(regs, cmd, DATA_IN_DIR); - if (hostdata->state != S_RUNNING_LEVEL2) - hostdata->state = S_CONNECTED; - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - - case CSR_XFER_DONE|PHS_DATA_OUT: - case CSR_UNEXP |PHS_DATA_OUT: - case CSR_SRV_REQ |PHS_DATA_OUT: -DB(DB_INTR,printk("OUT-%d.%d",cmd->SCp.this_residual,cmd->SCp.buffers_residual)) - transfer_bytes(regs, cmd, DATA_OUT_DIR); - if (hostdata->state != S_RUNNING_LEVEL2) - hostdata->state = S_CONNECTED; - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - + hostdata->outgoing_msg[1] = EXTENDED_MESSAGE; + hostdata->outgoing_msg[2] = 3; + hostdata->outgoing_msg[3] = EXTENDED_SDTR; + if (hostdata->no_sync & (1 << cmd->device->id)) { + hostdata->outgoing_msg[4] = + hostdata->default_sx_per / 4; + hostdata->outgoing_msg[5] = 0; + } else { + hostdata->outgoing_msg[4] = OPTIMUM_SX_PER / 4; + hostdata->outgoing_msg[5] = OPTIMUM_SX_OFF; + } + hostdata->outgoing_len = 6; + } else + hostdata->outgoing_len = 1; + + hostdata->state = S_CONNECTED; + spin_unlock_irqrestore(&hostdata->lock, flags); + break; + + case CSR_XFER_DONE | PHS_DATA_IN: + case CSR_UNEXP | PHS_DATA_IN: + case CSR_SRV_REQ | PHS_DATA_IN: + DB(DB_INTR, + printk("IN-%d.%d", cmd->SCp.this_residual, + cmd->SCp.buffers_residual)) + transfer_bytes(regs, cmd, DATA_IN_DIR); + if (hostdata->state != S_RUNNING_LEVEL2) + hostdata->state = S_CONNECTED; + spin_unlock_irqrestore(&hostdata->lock, flags); + break; + + case CSR_XFER_DONE | PHS_DATA_OUT: + case CSR_UNEXP | PHS_DATA_OUT: + case CSR_SRV_REQ | PHS_DATA_OUT: + DB(DB_INTR, + printk("OUT-%d.%d", cmd->SCp.this_residual, + cmd->SCp.buffers_residual)) + transfer_bytes(regs, cmd, DATA_OUT_DIR); + if (hostdata->state != S_RUNNING_LEVEL2) + hostdata->state = S_CONNECTED; + spin_unlock_irqrestore(&hostdata->lock, flags); + break; /* Note: this interrupt should not occur in a LEVEL2 command */ - case CSR_XFER_DONE|PHS_COMMAND: - case CSR_UNEXP |PHS_COMMAND: - case CSR_SRV_REQ |PHS_COMMAND: -DB(DB_INTR,printk("CMND-%02x,%ld",cmd->cmnd[0],cmd->pid)) - transfer_pio(regs, cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, hostdata); - hostdata->state = S_CONNECTED; - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - - case CSR_XFER_DONE|PHS_STATUS: - case CSR_UNEXP |PHS_STATUS: - case CSR_SRV_REQ |PHS_STATUS: -DB(DB_INTR,printk("STATUS=")) - - cmd->SCp.Status = read_1_byte(regs); -DB(DB_INTR,printk("%02x",cmd->SCp.Status)) - if (hostdata->level2 >= L2_BASIC) { - sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ - hostdata->state = S_RUNNING_LEVEL2; - write_wd33c93(regs, WD_COMMAND_PHASE, 0x50); - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); - } - else { - hostdata->state = S_CONNECTED; - } - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - - case CSR_XFER_DONE|PHS_MESS_IN: - case CSR_UNEXP |PHS_MESS_IN: - case CSR_SRV_REQ |PHS_MESS_IN: -DB(DB_INTR,printk("MSG_IN=")) - - msg = read_1_byte(regs); - sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ - - hostdata->incoming_msg[hostdata->incoming_ptr] = msg; - if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE) - msg = EXTENDED_MESSAGE; - else - hostdata->incoming_ptr = 0; - - cmd->SCp.Message = msg; - switch (msg) { - - case COMMAND_COMPLETE: -DB(DB_INTR,printk("CCMP-%ld",cmd->pid)) - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_PRE_CMP_DISC; - break; - - case SAVE_POINTERS: -DB(DB_INTR,printk("SDP")) - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - break; - - case RESTORE_POINTERS: -DB(DB_INTR,printk("RDP")) - if (hostdata->level2 >= L2_BASIC) { - write_wd33c93(regs, WD_COMMAND_PHASE, 0x45); - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); - hostdata->state = S_RUNNING_LEVEL2; - } - else { - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - } - break; - - case DISCONNECT: -DB(DB_INTR,printk("DIS")) - cmd->device->disconnect = 1; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_PRE_TMP_DISC; - break; + case CSR_XFER_DONE | PHS_COMMAND: + case CSR_UNEXP | PHS_COMMAND: + case CSR_SRV_REQ | PHS_COMMAND: + DB(DB_INTR, printk("CMND-%02x,%ld", cmd->cmnd[0], cmd->pid)) + transfer_pio(regs, cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, + hostdata); + hostdata->state = S_CONNECTED; + spin_unlock_irqrestore(&hostdata->lock, flags); + break; + + case CSR_XFER_DONE | PHS_STATUS: + case CSR_UNEXP | PHS_STATUS: + case CSR_SRV_REQ | PHS_STATUS: + DB(DB_INTR, printk("STATUS=")) + cmd->SCp.Status = read_1_byte(regs); + DB(DB_INTR, printk("%02x", cmd->SCp.Status)) + if (hostdata->level2 >= L2_BASIC) { + sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ + hostdata->state = S_RUNNING_LEVEL2; + write_wd33c93(regs, WD_COMMAND_PHASE, 0x50); + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); + } else { + hostdata->state = S_CONNECTED; + } + spin_unlock_irqrestore(&hostdata->lock, flags); + break; + + case CSR_XFER_DONE | PHS_MESS_IN: + case CSR_UNEXP | PHS_MESS_IN: + case CSR_SRV_REQ | PHS_MESS_IN: + DB(DB_INTR, printk("MSG_IN=")) + + msg = read_1_byte(regs); + sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ + + hostdata->incoming_msg[hostdata->incoming_ptr] = msg; + if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE) + msg = EXTENDED_MESSAGE; + else + hostdata->incoming_ptr = 0; + + cmd->SCp.Message = msg; + switch (msg) { + + case COMMAND_COMPLETE: + DB(DB_INTR, printk("CCMP-%ld", cmd->pid)) + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_PRE_CMP_DISC; + break; + + case SAVE_POINTERS: + DB(DB_INTR, printk("SDP")) + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + break; + + case RESTORE_POINTERS: + DB(DB_INTR, printk("RDP")) + if (hostdata->level2 >= L2_BASIC) { + write_wd33c93(regs, WD_COMMAND_PHASE, 0x45); + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); + hostdata->state = S_RUNNING_LEVEL2; + } else { + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + } + break; + + case DISCONNECT: + DB(DB_INTR, printk("DIS")) + cmd->device->disconnect = 1; + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_PRE_TMP_DISC; + break; - case MESSAGE_REJECT: -DB(DB_INTR,printk("REJ")) + case MESSAGE_REJECT: + DB(DB_INTR, printk("REJ")) #ifdef SYNC_DEBUG -printk("-REJ-"); + printk("-REJ-"); #endif - if (hostdata->sync_stat[cmd->target] == SS_WAITING) - hostdata->sync_stat[cmd->target] = SS_SET; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - break; + if (hostdata->sync_stat[cmd->device->id] == SS_WAITING) + hostdata->sync_stat[cmd->device->id] = SS_SET; + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + break; - case EXTENDED_MESSAGE: -DB(DB_INTR,printk("EXT")) + case EXTENDED_MESSAGE: + DB(DB_INTR, printk("EXT")) - ucp = hostdata->incoming_msg; + ucp = hostdata->incoming_msg; #ifdef SYNC_DEBUG -printk("%02x",ucp[hostdata->incoming_ptr]); + printk("%02x", ucp[hostdata->incoming_ptr]); #endif - /* Is this the last byte of the extended message? */ + /* Is this the last byte of the extended message? */ - if ((hostdata->incoming_ptr >= 2) && - (hostdata->incoming_ptr == (ucp[1] + 1))) { + if ((hostdata->incoming_ptr >= 2) && + (hostdata->incoming_ptr == (ucp[1] + 1))) { - switch (ucp[2]) { /* what's the EXTENDED code? */ - case EXTENDED_SDTR: - id = calc_sync_xfer(ucp[3],ucp[4]); - if (hostdata->sync_stat[cmd->target] != SS_WAITING) { + switch (ucp[2]) { /* what's the EXTENDED code? */ + case EXTENDED_SDTR: + id = calc_sync_xfer(ucp[3], ucp[4]); + if (hostdata->sync_stat[cmd->device->id] != + SS_WAITING) { /* A device has sent an unsolicited SDTR message; rather than go * through the effort of decoding it and then figuring out what @@ -1028,123 +1042,140 @@ * specifically ask for sync transfers, we won't do any. */ - write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ - hostdata->outgoing_msg[0] = EXTENDED_MESSAGE; - hostdata->outgoing_msg[1] = 3; - hostdata->outgoing_msg[2] = EXTENDED_SDTR; - hostdata->outgoing_msg[3] = hostdata->default_sx_per/4; - hostdata->outgoing_msg[4] = 0; - hostdata->outgoing_len = 5; - hostdata->sync_xfer[cmd->target] = - calc_sync_xfer(hostdata->default_sx_per/4,0); - } - else { - hostdata->sync_xfer[cmd->target] = id; - } + write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ + hostdata->outgoing_msg[0] = + EXTENDED_MESSAGE; + hostdata->outgoing_msg[1] = 3; + hostdata->outgoing_msg[2] = + EXTENDED_SDTR; + hostdata->outgoing_msg[3] = + hostdata->default_sx_per / + 4; + hostdata->outgoing_msg[4] = 0; + hostdata->outgoing_len = 5; + hostdata->sync_xfer[cmd->device->id] = + calc_sync_xfer(hostdata-> + default_sx_per + / 4, 0); + } else { + hostdata->sync_xfer[cmd->device->id] = id; + } #ifdef SYNC_DEBUG -printk("sync_xfer=%02x",hostdata->sync_xfer[cmd->target]); + printk("sync_xfer=%02x", + hostdata->sync_xfer[cmd->device->id]); #endif - hostdata->sync_stat[cmd->target] = SS_SET; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - break; - case EXTENDED_WDTR: - write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ - printk("sending WDTR "); - hostdata->outgoing_msg[0] = EXTENDED_MESSAGE; - hostdata->outgoing_msg[1] = 2; - hostdata->outgoing_msg[2] = EXTENDED_WDTR; - hostdata->outgoing_msg[3] = 0; /* 8 bit transfer width */ - hostdata->outgoing_len = 4; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - break; - default: - write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ - printk("Rejecting Unknown Extended Message(%02x). ",ucp[2]); - hostdata->outgoing_msg[0] = MESSAGE_REJECT; - hostdata->outgoing_len = 1; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - break; - } - hostdata->incoming_ptr = 0; - } - - /* We need to read more MESS_IN bytes for the extended message */ - - else { - hostdata->incoming_ptr++; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - } - break; - - default: - printk("Rejecting Unknown Message(%02x) ",msg); - write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ - hostdata->outgoing_msg[0] = MESSAGE_REJECT; - hostdata->outgoing_len = 1; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - hostdata->state = S_CONNECTED; - } - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - + hostdata->sync_stat[cmd->device->id] = + SS_SET; + write_wd33c93_cmd(regs, + WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + break; + case EXTENDED_WDTR: + write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ + printk("sending WDTR "); + hostdata->outgoing_msg[0] = + EXTENDED_MESSAGE; + hostdata->outgoing_msg[1] = 2; + hostdata->outgoing_msg[2] = + EXTENDED_WDTR; + hostdata->outgoing_msg[3] = 0; /* 8 bit transfer width */ + hostdata->outgoing_len = 4; + write_wd33c93_cmd(regs, + WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + break; + default: + write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ + printk + ("Rejecting Unknown Extended Message(%02x). ", + ucp[2]); + hostdata->outgoing_msg[0] = + MESSAGE_REJECT; + hostdata->outgoing_len = 1; + write_wd33c93_cmd(regs, + WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + break; + } + hostdata->incoming_ptr = 0; + } + + /* We need to read more MESS_IN bytes for the extended message */ + + else { + hostdata->incoming_ptr++; + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + } + break; + + default: + printk("Rejecting Unknown Message(%02x) ", msg); + write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */ + hostdata->outgoing_msg[0] = MESSAGE_REJECT; + hostdata->outgoing_len = 1; + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + hostdata->state = S_CONNECTED; + } + spin_unlock_irqrestore(&hostdata->lock, flags); + break; /* Note: this interrupt will occur only after a LEVEL2 command */ - case CSR_SEL_XFER_DONE: + case CSR_SEL_XFER_DONE: /* Make sure that reselection is enabled at this point - it may * have been turned off for the command that just completed. */ - write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER); - if (phs == 0x60) { -DB(DB_INTR,printk("SX-DONE-%ld",cmd->pid)) - cmd->SCp.Message = COMMAND_COMPLETE; - lun = read_wd33c93(regs, WD_TARGET_LUN); -DB(DB_INTR,printk(":%d.%d",cmd->SCp.Status,lun)) - hostdata->connected = NULL; - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - hostdata->state = S_UNCONNECTED; - if (cmd->SCp.Status == ILLEGAL_STATUS_BYTE) - cmd->SCp.Status = lun; - if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) - cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); - else - cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); - cmd->scsi_done(cmd); + write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER); + if (phs == 0x60) { + DB(DB_INTR, printk("SX-DONE-%ld", cmd->pid)) + cmd->SCp.Message = COMMAND_COMPLETE; + lun = read_wd33c93(regs, WD_TARGET_LUN); + DB(DB_INTR, printk(":%d.%d", cmd->SCp.Status, lun)) + hostdata->connected = NULL; + hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); + hostdata->state = S_UNCONNECTED; + if (cmd->SCp.Status == ILLEGAL_STATUS_BYTE) + cmd->SCp.Status = lun; + if (cmd->cmnd[0] == REQUEST_SENSE + && cmd->SCp.Status != GOOD) + cmd->result = + (cmd-> + result & 0x00ffff) | (DID_ERROR << 16); + else + cmd->result = + cmd->SCp.Status | (cmd->SCp.Message << 8); + cmd->scsi_done(cmd); /* We are no longer connected to a target - check to see if * there are commands waiting to be executed. */ - spin_unlock_irqrestore(&hostdata->lock, flags); - wd33c93_execute(instance); - } - else { - printk("%02x:%02x:%02x-%ld: Unknown SEL_XFER_DONE phase!!---",asr,sr,phs,cmd->pid); - spin_unlock_irqrestore(&hostdata->lock, flags); - } - break; - + spin_unlock_irqrestore(&hostdata->lock, flags); + wd33c93_execute(instance); + } else { + printk + ("%02x:%02x:%02x-%ld: Unknown SEL_XFER_DONE phase!!---", + asr, sr, phs, cmd->pid); + spin_unlock_irqrestore(&hostdata->lock, flags); + } + break; /* Note: this interrupt will occur only after a LEVEL2 command */ - case CSR_SDP: -DB(DB_INTR,printk("SDP")) - hostdata->state = S_RUNNING_LEVEL2; - write_wd33c93(regs, WD_COMMAND_PHASE, 0x41); - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - - case CSR_XFER_DONE|PHS_MESS_OUT: - case CSR_UNEXP |PHS_MESS_OUT: - case CSR_SRV_REQ |PHS_MESS_OUT: -DB(DB_INTR,printk("MSG_OUT=")) + case CSR_SDP: + DB(DB_INTR, printk("SDP")) + hostdata->state = S_RUNNING_LEVEL2; + write_wd33c93(regs, WD_COMMAND_PHASE, 0x41); + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); + spin_unlock_irqrestore(&hostdata->lock, flags); + break; + + case CSR_XFER_DONE | PHS_MESS_OUT: + case CSR_UNEXP | PHS_MESS_OUT: + case CSR_SRV_REQ | PHS_MESS_OUT: + DB(DB_INTR, printk("MSG_OUT=")) /* To get here, we've probably requested MESSAGE_OUT and have * already put the correct bytes in outgoing_msg[] and filled @@ -1158,21 +1189,19 @@ * NOP messages in these situations results in no harm and * makes everyone happy. */ + if (hostdata->outgoing_len == 0) { + hostdata->outgoing_len = 1; + hostdata->outgoing_msg[0] = NOP; + } + transfer_pio(regs, hostdata->outgoing_msg, + hostdata->outgoing_len, DATA_OUT_DIR, hostdata); + DB(DB_INTR, printk("%02x", hostdata->outgoing_msg[0])) + hostdata->outgoing_len = 0; + hostdata->state = S_CONNECTED; + spin_unlock_irqrestore(&hostdata->lock, flags); + break; - if (hostdata->outgoing_len == 0) { - hostdata->outgoing_len = 1; - hostdata->outgoing_msg[0] = NOP; - } - transfer_pio(regs, hostdata->outgoing_msg, hostdata->outgoing_len, - DATA_OUT_DIR, hostdata); -DB(DB_INTR,printk("%02x",hostdata->outgoing_msg[0])) - hostdata->outgoing_len = 0; - hostdata->state = S_CONNECTED; - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - - case CSR_UNEXP_DISC: + case CSR_UNEXP_DISC: /* I think I've seen this after a request-sense that was in response * to an error condition, but not sure. We certainly need to do @@ -1186,353 +1215,387 @@ * have been turned off for the command that just completed. */ - write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER); - if (cmd == NULL) { - printk(" - Already disconnected! "); - hostdata->state = S_UNCONNECTED; - spin_unlock_irqrestore(&hostdata->lock, flags); - return; - } -DB(DB_INTR,printk("UNEXP_DISC-%ld",cmd->pid)) - hostdata->connected = NULL; - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - hostdata->state = S_UNCONNECTED; - if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) - cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); - else - cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); - cmd->scsi_done(cmd); + write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER); + if (cmd == NULL) { + printk(" - Already disconnected! "); + hostdata->state = S_UNCONNECTED; + spin_unlock_irqrestore(&hostdata->lock, flags); + return; + } + DB(DB_INTR, printk("UNEXP_DISC-%ld", cmd->pid)) + hostdata->connected = NULL; + hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); + hostdata->state = S_UNCONNECTED; + if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) + cmd->result = + (cmd->result & 0x00ffff) | (DID_ERROR << 16); + else + cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); + cmd->scsi_done(cmd); /* We are no longer connected to a target - check to see if * there are commands waiting to be executed. */ - /* look above for comments on scsi_done() */ - spin_unlock_irqrestore(&hostdata->lock, flags); - wd33c93_execute(instance); - break; + /* look above for comments on scsi_done() */ + spin_unlock_irqrestore(&hostdata->lock, flags); + wd33c93_execute(instance); + break; - - case CSR_DISC: + case CSR_DISC: /* Make sure that reselection is enabled at this point - it may * have been turned off for the command that just completed. */ - write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER); -DB(DB_INTR,printk("DISC-%ld",cmd->pid)) - if (cmd == NULL) { - printk(" - Already disconnected! "); - hostdata->state = S_UNCONNECTED; - } - switch (hostdata->state) { - case S_PRE_CMP_DISC: - hostdata->connected = NULL; - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - hostdata->state = S_UNCONNECTED; -DB(DB_INTR,printk(":%d",cmd->SCp.Status)) - if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) - cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); - else - cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); - cmd->scsi_done(cmd); - break; - case S_PRE_TMP_DISC: - case S_RUNNING_LEVEL2: - cmd->host_scribble = (uchar *)hostdata->disconnected_Q; - hostdata->disconnected_Q = cmd; - hostdata->connected = NULL; - hostdata->state = S_UNCONNECTED; + write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER); + DB(DB_INTR, printk("DISC-%ld", cmd->pid)) + if (cmd == NULL) { + printk(" - Already disconnected! "); + hostdata->state = S_UNCONNECTED; + } + switch (hostdata->state) { + case S_PRE_CMP_DISC: + hostdata->connected = NULL; + hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); + hostdata->state = S_UNCONNECTED; + DB(DB_INTR, printk(":%d", cmd->SCp.Status)) + if (cmd->cmnd[0] == REQUEST_SENSE + && cmd->SCp.Status != GOOD) + cmd->result = + (cmd-> + result & 0x00ffff) | (DID_ERROR << 16); + else + cmd->result = + cmd->SCp.Status | (cmd->SCp.Message << 8); + cmd->scsi_done(cmd); + break; + case S_PRE_TMP_DISC: + case S_RUNNING_LEVEL2: + cmd->host_scribble = (uchar *) hostdata->disconnected_Q; + hostdata->disconnected_Q = cmd; + hostdata->connected = NULL; + hostdata->state = S_UNCONNECTED; #ifdef PROC_STATISTICS - hostdata->disc_done_cnt[cmd->target]++; + hostdata->disc_done_cnt[cmd->device->id]++; #endif - break; - default: - printk("*** Unexpected DISCONNECT interrupt! ***"); - hostdata->state = S_UNCONNECTED; - } + break; + default: + printk("*** Unexpected DISCONNECT interrupt! ***"); + hostdata->state = S_UNCONNECTED; + } /* We are no longer connected to a target - check to see if * there are commands waiting to be executed. */ - spin_unlock_irqrestore(&hostdata->lock, flags); - wd33c93_execute(instance); - break; - - - case CSR_RESEL_AM: - case CSR_RESEL: -DB(DB_INTR,printk("RESEL%s", sr == CSR_RESEL_AM ? "_AM" : "")) - - /* Old chips (pre -A ???) don't have advanced features and will - * generate CSR_RESEL. In that case we have to extract the LUN the - * hard way (see below). - * First we have to make sure this reselection didn't - * happen during Arbitration/Selection of some other device. - * If yes, put losing command back on top of input_Q. - */ - - if (hostdata->level2 <= L2_NONE) { - - if (hostdata->selecting) { - cmd = (Scsi_Cmnd *)hostdata->selecting; - hostdata->selecting = NULL; - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - cmd->host_scribble = (uchar *)hostdata->input_Q; - hostdata->input_Q = cmd; - } - } - - else { - - if (cmd) { - if (phs == 0x00) { - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - cmd->host_scribble = (uchar *)hostdata->input_Q; - hostdata->input_Q = cmd; - } - else { - printk("---%02x:%02x:%02x-TROUBLE: Intrusive ReSelect!---",asr,sr,phs); - while (1) - printk("\r"); - } - } - - } - - /* OK - find out which device reselected us. */ - - id = read_wd33c93(regs, WD_SOURCE_ID); - id &= SRCID_MASK; - - /* and extract the lun from the ID message. (Note that we don't - * bother to check for a valid message here - I guess this is - * not the right way to go, but...) - */ - - if (sr == CSR_RESEL_AM) { - lun = read_wd33c93(regs, WD_DATA); - if (hostdata->level2 < L2_RESELECT) - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - lun &= 7; - } - else { - /* Old chip; wait for msgin phase to pick up the LUN. */ - for (lun = 255; lun; lun--) { - if ((asr = READ_AUX_STAT()) & ASR_INT) - break; - udelay(10); - } - if (!(asr & ASR_INT)) { - printk("wd33c93: Reselected without IDENTIFY\n"); - lun = 0; - } - else { - /* Verify this is a change to MSG_IN and read the message */ - sr = read_wd33c93(regs, WD_SCSI_STATUS); - if (sr == (CSR_ABORT | PHS_MESS_IN) || - sr == (CSR_UNEXP | PHS_MESS_IN) || - sr == (CSR_SRV_REQ | PHS_MESS_IN)) { - /* Got MSG_IN, grab target LUN */ - lun = read_1_byte(regs); - /* Now we expect a 'paused with ACK asserted' int.. */ - asr = READ_AUX_STAT(); - if (!(asr & ASR_INT)) { - udelay(10); - asr = READ_AUX_STAT(); - if (!(asr & ASR_INT)) - printk("wd33c93: No int after LUN on RESEL (%02x)\n", - asr); - } - sr = read_wd33c93(regs, WD_SCSI_STATUS); - if (sr != CSR_MSGIN) - printk("wd33c93: Not paused with ACK on RESEL (%02x)\n", - sr); - lun &= 7; - write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); - } - else { - printk("wd33c93: Not MSG_IN on reselect (%02x)\n", sr); - lun = 0; - } - } - } - - /* Now we look for the command that's reconnecting. */ - - cmd = (Scsi_Cmnd *)hostdata->disconnected_Q; - patch = NULL; - while (cmd) { - if (id == cmd->target && lun == cmd->lun) - break; - patch = cmd; - cmd = (Scsi_Cmnd *)cmd->host_scribble; - } - - /* Hmm. Couldn't find a valid command.... What to do? */ - - if (!cmd) { - printk("---TROUBLE: target %d.%d not in disconnect queue---",id,lun); - spin_unlock_irqrestore(&hostdata->lock, flags); - return; - } - - /* Ok, found the command - now start it up again. */ - - if (patch) - patch->host_scribble = cmd->host_scribble; - else - hostdata->disconnected_Q = (Scsi_Cmnd *)cmd->host_scribble; - hostdata->connected = cmd; - - /* We don't need to worry about 'initialize_SCp()' or 'hostdata->busy[]' - * because these things are preserved over a disconnect. - * But we DO need to fix the DPD bit so it's correct for this command. - */ - - if (is_dir_out(cmd)) - write_wd33c93(regs, WD_DESTINATION_ID, cmd->target); - else - write_wd33c93(regs, WD_DESTINATION_ID, cmd->target | DSTID_DPD); - if (hostdata->level2 >= L2_RESELECT) { - write_wd33c93_count(regs, 0); /* we want a DATA_PHASE interrupt */ - write_wd33c93(regs, WD_COMMAND_PHASE, 0x45); - write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); - hostdata->state = S_RUNNING_LEVEL2; - } - else - hostdata->state = S_CONNECTED; - -DB(DB_INTR,printk("-%ld",cmd->pid)) - spin_unlock_irqrestore(&hostdata->lock, flags); - break; - - default: - printk("--UNKNOWN INTERRUPT:%02x:%02x:%02x--",asr,sr,phs); - spin_unlock_irqrestore(&hostdata->lock, flags); - } - -DB(DB_INTR,printk("} ")) - -} + spin_unlock_irqrestore(&hostdata->lock, flags); + wd33c93_execute(instance); + break; + + case CSR_RESEL_AM: + case CSR_RESEL: + DB(DB_INTR, printk("RESEL%s", sr == CSR_RESEL_AM ? "_AM" : "")) + + /* Old chips (pre -A ???) don't have advanced features and will + * generate CSR_RESEL. In that case we have to extract the LUN the + * hard way (see below). + * First we have to make sure this reselection didn't + * happen during Arbitration/Selection of some other device. + * If yes, put losing command back on top of input_Q. + */ + if (hostdata->level2 <= L2_NONE) { + + if (hostdata->selecting) { + cmd = (Scsi_Cmnd *) hostdata->selecting; + hostdata->selecting = NULL; + hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); + cmd->host_scribble = + (uchar *) hostdata->input_Q; + hostdata->input_Q = cmd; + } + } + + else { + + if (cmd) { + if (phs == 0x00) { + hostdata->busy[cmd->device->id] &= + ~(1 << cmd->device->lun); + cmd->host_scribble = + (uchar *) hostdata->input_Q; + hostdata->input_Q = cmd; + } else { + printk + ("---%02x:%02x:%02x-TROUBLE: Intrusive ReSelect!---", + asr, sr, phs); + while (1) + printk("\r"); + } + } + + } + + /* OK - find out which device reselected us. */ + + id = read_wd33c93(regs, WD_SOURCE_ID); + id &= SRCID_MASK; + + /* and extract the lun from the ID message. (Note that we don't + * bother to check for a valid message here - I guess this is + * not the right way to go, but...) + */ + + if (sr == CSR_RESEL_AM) { + lun = read_wd33c93(regs, WD_DATA); + if (hostdata->level2 < L2_RESELECT) + write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK); + lun &= 7; + } else { + /* Old chip; wait for msgin phase to pick up the LUN. */ + for (lun = 255; lun; lun--) { + if ((asr = read_aux_stat(regs)) & ASR_INT) + break; + udelay(10); + } + if (!(asr & ASR_INT)) { + printk + ("wd33c93: Reselected without IDENTIFY\n"); + lun = 0; + } else { + /* Verify this is a change to MSG_IN and read the message */ + sr = read_wd33c93(regs, WD_SCSI_STATUS); + if (sr == (CSR_ABORT | PHS_MESS_IN) || + sr == (CSR_UNEXP | PHS_MESS_IN) || + sr == (CSR_SRV_REQ | PHS_MESS_IN)) { + /* Got MSG_IN, grab target LUN */ + lun = read_1_byte(regs); + /* Now we expect a 'paused with ACK asserted' int.. */ + asr = read_aux_stat(regs); + if (!(asr & ASR_INT)) { + udelay(10); + asr = read_aux_stat(regs); + if (!(asr & ASR_INT)) + printk + ("wd33c93: No int after LUN on RESEL (%02x)\n", + asr); + } + sr = read_wd33c93(regs, WD_SCSI_STATUS); + if (sr != CSR_MSGIN) + printk + ("wd33c93: Not paused with ACK on RESEL (%02x)\n", + sr); + lun &= 7; + write_wd33c93_cmd(regs, + WD_CMD_NEGATE_ACK); + } else { + printk + ("wd33c93: Not MSG_IN on reselect (%02x)\n", + sr); + lun = 0; + } + } + } + + /* Now we look for the command that's reconnecting. */ + + cmd = (Scsi_Cmnd *) hostdata->disconnected_Q; + patch = NULL; + while (cmd) { + if (id == cmd->device->id && lun == cmd->device->lun) + break; + patch = cmd; + cmd = (Scsi_Cmnd *) cmd->host_scribble; + } + + /* Hmm. Couldn't find a valid command.... What to do? */ + + if (!cmd) { + printk + ("---TROUBLE: target %d.%d not in disconnect queue---", + id, lun); + spin_unlock_irqrestore(&hostdata->lock, flags); + return; + } + + /* Ok, found the command - now start it up again. */ + + if (patch) + patch->host_scribble = cmd->host_scribble; + else + hostdata->disconnected_Q = + (Scsi_Cmnd *) cmd->host_scribble; + hostdata->connected = cmd; + + /* We don't need to worry about 'initialize_SCp()' or 'hostdata->busy[]' + * because these things are preserved over a disconnect. + * But we DO need to fix the DPD bit so it's correct for this command. + */ + + if (is_dir_out(cmd)) + write_wd33c93(regs, WD_DESTINATION_ID, cmd->device->id); + else + write_wd33c93(regs, WD_DESTINATION_ID, + cmd->device->id | DSTID_DPD); + if (hostdata->level2 >= L2_RESELECT) { + write_wd33c93_count(regs, 0); /* we want a DATA_PHASE interrupt */ + write_wd33c93(regs, WD_COMMAND_PHASE, 0x45); + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); + hostdata->state = S_RUNNING_LEVEL2; + } else + hostdata->state = S_CONNECTED; + + DB(DB_INTR, printk("-%ld", cmd->pid)) + spin_unlock_irqrestore(&hostdata->lock, flags); + break; + + default: + printk("--UNKNOWN INTERRUPT:%02x:%02x:%02x--", asr, sr, phs); + spin_unlock_irqrestore(&hostdata->lock, flags); + } + + DB(DB_INTR, printk("} ")) + +} + +static void +reset_wd33c93(struct Scsi_Host *instance) +{ + struct WD33C93_hostdata *hostdata = + (struct WD33C93_hostdata *) instance->hostdata; + const wd33c93_regs regs = hostdata->regs; + uchar sr; + +#ifdef CONFIG_SGI_IP22 + { + int busycount = 0; + extern void sgiwd93_reset(unsigned long); + /* wait 'til the chip gets some time for us */ + while ((READ_AUX_STAT() & ASR_BSY) && busycount++ < 100) + udelay (10); + /* + * there are scsi devices out there, which manage to lock up + * the wd33c93 in a busy condition. In this state it won't + * accept the reset command. The only way to solve this is to + * give the chip a hardware reset (if possible). The code below + * does this for the SGI Indy, where this is possible + */ + /* still busy ? */ + if (READ_AUX_STAT() & ASR_BSY) + sgiwd93_reset(instance->base); /* yeah, give it the hard one */ + } +#endif + write_wd33c93(regs, WD_OWN_ID, OWNID_EAF | OWNID_RAF | + instance->this_id | hostdata->clock_freq); + write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); + write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER, + calc_sync_xfer(hostdata->default_sx_per / 4, + DEFAULT_SX_OFF)); + write_wd33c93(regs, WD_COMMAND, WD_CMD_RESET); -static void reset_wd33c93(struct Scsi_Host *instance) -{ -struct WD33C93_hostdata *hostdata = (struct WD33C93_hostdata *)instance->hostdata; -const wd33c93_regs regs = hostdata->regs; -uchar sr; - - write_wd33c93(regs, WD_OWN_ID, OWNID_EAF | OWNID_RAF | - instance->this_id | hostdata->clock_freq); - write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); - write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER, - calc_sync_xfer(hostdata->default_sx_per/4,DEFAULT_SX_OFF)); - write_wd33c93(regs, WD_COMMAND, WD_CMD_RESET); #ifdef CONFIG_MVME147_SCSI - udelay(25); /* The old wd33c93 on MVME147 needs this, at least */ + udelay(25); /* The old wd33c93 on MVME147 needs this, at least */ #endif - while (!(READ_AUX_STAT() & ASR_INT)) - ; - sr = read_wd33c93(regs, WD_SCSI_STATUS); - - hostdata->microcode = read_wd33c93(regs, WD_CDB_1); - if (sr == 0x00) - hostdata->chip = C_WD33C93; - else if (sr == 0x01) { - write_wd33c93(regs, WD_QUEUE_TAG, 0xa5); /* any random number */ - sr = read_wd33c93(regs, WD_QUEUE_TAG); - if (sr == 0xa5) { - hostdata->chip = C_WD33C93B; - write_wd33c93(regs, WD_QUEUE_TAG, 0); - } - else - hostdata->chip = C_WD33C93A; - } - else - hostdata->chip = C_UNKNOWN_CHIP; - - write_wd33c93(regs, WD_TIMEOUT_PERIOD, TIMEOUT_PERIOD_VALUE); - write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); -} - - - -int wd33c93_reset(Scsi_Cmnd *SCpnt, unsigned int reset_flags) -{ -struct Scsi_Host *instance; -struct WD33C93_hostdata *hostdata; -int i; - - instance = SCpnt->host; - hostdata = (struct WD33C93_hostdata *)instance->hostdata; - - printk("scsi%d: reset. ", instance->host_no); - disable_irq(instance->irq); - - ((struct WD33C93_hostdata *)instance->hostdata)->dma_stop(instance,NULL,0); - for (i = 0; i < 8; i++) { - hostdata->busy[i] = 0; - hostdata->sync_xfer[i] = calc_sync_xfer(DEFAULT_SX_PER/4,DEFAULT_SX_OFF); - hostdata->sync_stat[i] = SS_UNSET; /* using default sync values */ - } - hostdata->input_Q = NULL; - hostdata->selecting = NULL; - hostdata->connected = NULL; - hostdata->disconnected_Q = NULL; - hostdata->state = S_UNCONNECTED; - hostdata->dma = D_DMA_OFF; - hostdata->incoming_ptr = 0; - hostdata->outgoing_len = 0; - - reset_wd33c93(instance); - SCpnt->result = DID_RESET << 16; - enable_irq(instance->irq); - return 0; -} - - - -int wd33c93_abort (Scsi_Cmnd *cmd) -{ -struct Scsi_Host *instance; -struct WD33C93_hostdata *hostdata; -wd33c93_regs regs; -Scsi_Cmnd *tmp, *prev; - - disable_irq(cmd->host->irq); - - instance = cmd->host; - hostdata = (struct WD33C93_hostdata *)instance->hostdata; - regs = hostdata->regs; + while (!(read_aux_stat(regs) & ASR_INT)) + ; + sr = read_wd33c93(regs, WD_SCSI_STATUS); + + hostdata->microcode = read_wd33c93(regs, WD_CDB_1); + if (sr == 0x00) + hostdata->chip = C_WD33C93; + else if (sr == 0x01) { + write_wd33c93(regs, WD_QUEUE_TAG, 0xa5); /* any random number */ + sr = read_wd33c93(regs, WD_QUEUE_TAG); + if (sr == 0xa5) { + hostdata->chip = C_WD33C93B; + write_wd33c93(regs, WD_QUEUE_TAG, 0); + } else + hostdata->chip = C_WD33C93A; + } else + hostdata->chip = C_UNKNOWN_CHIP; + + write_wd33c93(regs, WD_TIMEOUT_PERIOD, TIMEOUT_PERIOD_VALUE); + write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); +} + +int +wd33c93_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags) +{ + struct Scsi_Host *instance; + struct WD33C93_hostdata *hostdata; + int i; + + instance = SCpnt->device->host; + hostdata = (struct WD33C93_hostdata *) instance->hostdata; + + printk("scsi%d: reset. ", instance->host_no); + disable_irq(instance->irq); + + hostdata->dma_stop(instance, NULL, 0); + for (i = 0; i < 8; i++) { + hostdata->busy[i] = 0; + hostdata->sync_xfer[i] = + calc_sync_xfer(DEFAULT_SX_PER / 4, DEFAULT_SX_OFF); + hostdata->sync_stat[i] = SS_UNSET; /* using default sync values */ + } + hostdata->input_Q = NULL; + hostdata->selecting = NULL; + hostdata->connected = NULL; + hostdata->disconnected_Q = NULL; + hostdata->state = S_UNCONNECTED; + hostdata->dma = D_DMA_OFF; + hostdata->incoming_ptr = 0; + hostdata->outgoing_len = 0; + + reset_wd33c93(instance); + SCpnt->result = DID_RESET << 16; + enable_irq(instance->irq); + return 0; +} + +int +wd33c93_abort(Scsi_Cmnd * cmd) +{ + struct Scsi_Host *instance; + struct WD33C93_hostdata *hostdata; + wd33c93_regs regs; + Scsi_Cmnd *tmp, *prev; + + disable_irq(cmd->device->host->irq); + + instance = cmd->device->host; + hostdata = (struct WD33C93_hostdata *) instance->hostdata; + regs = hostdata->regs; /* * Case 1 : If the command hasn't been issued yet, we simply remove it * from the input_Q. */ - tmp = (Scsi_Cmnd *)hostdata->input_Q; - prev = 0; - while (tmp) { - if (tmp == cmd) { - if (prev) - prev->host_scribble = cmd->host_scribble; - else - hostdata->input_Q = (Scsi_Cmnd *)cmd->host_scribble; - cmd->host_scribble = NULL; - cmd->result = DID_ABORT << 16; - printk("scsi%d: Abort - removing command %ld from input_Q. ", - instance->host_no, cmd->pid); - enable_irq(cmd->host->irq); - cmd->scsi_done(cmd); - return SCSI_ABORT_SUCCESS; - } - prev = tmp; - tmp = (Scsi_Cmnd *)tmp->host_scribble; - } + tmp = (Scsi_Cmnd *) hostdata->input_Q; + prev = 0; + while (tmp) { + if (tmp == cmd) { + if (prev) + prev->host_scribble = cmd->host_scribble; + else + hostdata->input_Q = + (Scsi_Cmnd *) cmd->host_scribble; + cmd->host_scribble = NULL; + cmd->result = DID_ABORT << 16; + printk + ("scsi%d: Abort - removing command %ld from input_Q. ", + instance->host_no, cmd->pid); + enable_irq(cmd->device->host->irq); + cmd->scsi_done(cmd); + return SCSI_ABORT_SUCCESS; + } + prev = tmp; + tmp = (Scsi_Cmnd *) tmp->host_scribble; + } /* * Case 2 : If the command is connected, we're going to fail the abort @@ -1545,64 +1608,66 @@ * we fail. */ - if (hostdata->connected == cmd) { - uchar sr, asr; - unsigned long timeout; - - printk("scsi%d: Aborting connected command %ld - ", - instance->host_no, cmd->pid); - - printk("stopping DMA - "); - if (hostdata->dma == D_DMA_RUNNING) { - hostdata->dma_stop(instance, cmd, 0); - hostdata->dma = D_DMA_OFF; - } - - printk("sending wd33c93 ABORT command - "); - write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED); - write_wd33c93_cmd(regs, WD_CMD_ABORT); + if (hostdata->connected == cmd) { + uchar sr, asr; + unsigned long timeout; + + printk("scsi%d: Aborting connected command %ld - ", + instance->host_no, cmd->pid); + + printk("stopping DMA - "); + if (hostdata->dma == D_DMA_RUNNING) { + hostdata->dma_stop(instance, cmd, 0); + hostdata->dma = D_DMA_OFF; + } + + printk("sending wd33c93 ABORT command - "); + write_wd33c93(regs, WD_CONTROL, + CTRL_IDI | CTRL_EDI | CTRL_POLLED); + write_wd33c93_cmd(regs, WD_CMD_ABORT); /* Now we have to attempt to flush out the FIFO... */ - printk("flushing fifo - "); - timeout = 1000000; - do { - asr = READ_AUX_STAT(); - if (asr & ASR_DBR) - read_wd33c93(regs, WD_DATA); - } while (!(asr & ASR_INT) && timeout-- > 0); - sr = read_wd33c93(regs, WD_SCSI_STATUS); - printk("asr=%02x, sr=%02x, %ld bytes un-transferred (timeout=%ld) - ", - asr, sr, read_wd33c93_count(regs), timeout); - - /* - * Abort command processed. - * Still connected. - * We must disconnect. - */ - - printk("sending wd33c93 DISCONNECT command - "); - write_wd33c93_cmd(regs, WD_CMD_DISCONNECT); - - timeout = 1000000; - asr = READ_AUX_STAT(); - while ((asr & ASR_CIP) && timeout-- > 0) - asr = READ_AUX_STAT(); - sr = read_wd33c93(regs, WD_SCSI_STATUS); - printk("asr=%02x, sr=%02x.",asr,sr); - - hostdata->busy[cmd->target] &= ~(1 << cmd->lun); - hostdata->connected = NULL; - hostdata->state = S_UNCONNECTED; - cmd->result = DID_ABORT << 16; + printk("flushing fifo - "); + timeout = 1000000; + do { + asr = read_aux_stat(regs); + if (asr & ASR_DBR) + read_wd33c93(regs, WD_DATA); + } while (!(asr & ASR_INT) && timeout-- > 0); + sr = read_wd33c93(regs, WD_SCSI_STATUS); + printk + ("asr=%02x, sr=%02x, %ld bytes un-transferred (timeout=%ld) - ", + asr, sr, read_wd33c93_count(regs), timeout); + + /* + * Abort command processed. + * Still connected. + * We must disconnect. + */ + + printk("sending wd33c93 DISCONNECT command - "); + write_wd33c93_cmd(regs, WD_CMD_DISCONNECT); + + timeout = 1000000; + asr = read_aux_stat(regs); + while ((asr & ASR_CIP) && timeout-- > 0) + asr = read_aux_stat(regs); + sr = read_wd33c93(regs, WD_SCSI_STATUS); + printk("asr=%02x, sr=%02x.", asr, sr); + + hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun); + hostdata->connected = NULL; + hostdata->state = S_UNCONNECTED; + cmd->result = DID_ABORT << 16; /* sti();*/ - wd33c93_execute (instance); + wd33c93_execute(instance); - enable_irq(cmd->host->irq); - cmd->scsi_done(cmd); - return SCSI_ABORT_SUCCESS; - } + enable_irq(cmd->device->host->irq); + cmd->scsi_done(cmd); + return SCSI_ABORT_SUCCESS; + } /* * Case 3: If the command is currently disconnected from the bus, @@ -1610,17 +1675,18 @@ * an ABORT_SNOOZE and hope for the best... */ - tmp = (Scsi_Cmnd *)hostdata->disconnected_Q; - while (tmp) { - if (tmp == cmd) { - printk("scsi%d: Abort - command %ld found on disconnected_Q - ", - instance->host_no, cmd->pid); - printk("returning ABORT_SNOOZE. "); - enable_irq(cmd->host->irq); - return SCSI_ABORT_SNOOZE; - } - tmp = (Scsi_Cmnd *)tmp->host_scribble; - } + tmp = (Scsi_Cmnd *) hostdata->disconnected_Q; + while (tmp) { + if (tmp == cmd) { + printk + ("scsi%d: Abort - command %ld found on disconnected_Q - ", + instance->host_no, cmd->pid); + printk("returning ABORT_SNOOZE. "); + enable_irq(cmd->device->host->irq); + return SCSI_ABORT_SNOOZE; + } + tmp = (Scsi_Cmnd *) tmp->host_scribble; + } /* * Case 4 : If we reached this point, the command was not found in any of @@ -1633,16 +1699,14 @@ */ /* sti();*/ - wd33c93_execute (instance); + wd33c93_execute(instance); - enable_irq(cmd->host->irq); - printk("scsi%d: warning : SCSI command probably completed successfully" - " before abortion. ", instance->host_no); - return SCSI_ABORT_NOT_RUNNING; + enable_irq(cmd->device->host->irq); + printk("scsi%d: warning : SCSI command probably completed successfully" + " before abortion. ", instance->host_no); + return SCSI_ABORT_NOT_RUNNING; } - - #define MAX_WD33C93_HOSTS 4 #define MAX_SETUP_ARGS ((int)(sizeof(setup_args) / sizeof(char *))) #define SETUP_BUFFER_SIZE 200 @@ -1650,238 +1714,224 @@ static char setup_used[MAX_SETUP_ARGS]; static int done_setup = 0; -int wd33c93_setup (char *str) +int +wd33c93_setup(char *str) { - int i; - char *p1,*p2; + int i; + char *p1, *p2; - /* The kernel does some processing of the command-line before calling - * this function: If it begins with any decimal or hex number arguments, - * ints[0] = how many numbers found and ints[1] through [n] are the values - * themselves. str points to where the non-numeric arguments (if any) - * start: We do our own parsing of those. We construct synthetic 'nosync' - * keywords out of numeric args (to maintain compatibility with older - * versions) and then add the rest of the arguments. - */ - - p1 = setup_buffer; - *p1 = '\0'; -#if 0 -/* - * Old style command line arguments are now dead - */ - if (ints[0]) { - for (i=0; i= '0') && (*cp <= '9')) { - *val = simple_strtoul(cp,NULL,0); - } - return ++x; -} - - + int x; + char *cp; -void wd33c93_init(struct Scsi_Host *instance, const wd33c93_regs regs, - dma_setup_t setup, dma_stop_t stop, int clock_freq) -{ -struct WD33C93_hostdata *hostdata; -int i; -int flags; -int val; -char buf[32]; - - if (!done_setup && setup_strings) - wd33c93_setup(setup_strings); - - hostdata = (struct WD33C93_hostdata *)instance->hostdata; - - hostdata->regs = regs; - hostdata->clock_freq = clock_freq; - hostdata->dma_setup = setup; - hostdata->dma_stop = stop; - hostdata->dma_bounce_buffer = NULL; - hostdata->dma_bounce_len = 0; - for (i = 0; i < 8; i++) { - hostdata->busy[i] = 0; - hostdata->sync_xfer[i] = calc_sync_xfer(DEFAULT_SX_PER/4,DEFAULT_SX_OFF); - hostdata->sync_stat[i] = SS_UNSET; /* using default sync values */ + for (x = 0; x < MAX_SETUP_ARGS; x++) { + if (setup_used[x]) + continue; + if (!strncmp(setup_args[x], key, strlen(key))) + break; + if (!strncmp(setup_args[x], "next", strlen("next"))) + return 0; + } + if (x == MAX_SETUP_ARGS) + return 0; + setup_used[x] = 1; + cp = setup_args[x] + strlen(key); + *val = -1; + if (*cp != ':') + return ++x; + cp++; + if ((*cp >= '0') && (*cp <= '9')) { + *val = simple_strtoul(cp, NULL, 0); + } + return ++x; +} + +void +wd33c93_init(struct Scsi_Host *instance, const wd33c93_regs regs, + dma_setup_t setup, dma_stop_t stop, int clock_freq) +{ + struct WD33C93_hostdata *hostdata; + int i; + int flags; + int val; + char buf[32]; + + if (!done_setup && setup_strings) + wd33c93_setup(setup_strings); + + hostdata = (struct WD33C93_hostdata *) instance->hostdata; + + hostdata->regs = regs; + hostdata->clock_freq = clock_freq; + hostdata->dma_setup = setup; + hostdata->dma_stop = stop; + hostdata->dma_bounce_buffer = NULL; + hostdata->dma_bounce_len = 0; + for (i = 0; i < 8; i++) { + hostdata->busy[i] = 0; + hostdata->sync_xfer[i] = + calc_sync_xfer(DEFAULT_SX_PER / 4, DEFAULT_SX_OFF); + hostdata->sync_stat[i] = SS_UNSET; /* using default sync values */ #ifdef PROC_STATISTICS - hostdata->cmd_cnt[i] = 0; - hostdata->disc_allowed_cnt[i] = 0; - hostdata->disc_done_cnt[i] = 0; + hostdata->cmd_cnt[i] = 0; + hostdata->disc_allowed_cnt[i] = 0; + hostdata->disc_done_cnt[i] = 0; #endif - } - hostdata->input_Q = NULL; - hostdata->selecting = NULL; - hostdata->connected = NULL; - hostdata->disconnected_Q = NULL; - hostdata->state = S_UNCONNECTED; - hostdata->dma = D_DMA_OFF; - hostdata->level2 = L2_BASIC; - hostdata->disconnect = DIS_ADAPTIVE; - hostdata->args = DEBUG_DEFAULTS; - hostdata->incoming_ptr = 0; - hostdata->outgoing_len = 0; - hostdata->default_sx_per = DEFAULT_SX_PER; - hostdata->no_sync = 0xff; /* sync defaults to off */ - hostdata->no_dma = 0; /* default is DMA enabled */ + } + hostdata->input_Q = NULL; + hostdata->selecting = NULL; + hostdata->connected = NULL; + hostdata->disconnected_Q = NULL; + hostdata->state = S_UNCONNECTED; + hostdata->dma = D_DMA_OFF; + hostdata->level2 = L2_BASIC; + hostdata->disconnect = DIS_ADAPTIVE; + hostdata->args = DEBUG_DEFAULTS; + hostdata->incoming_ptr = 0; + hostdata->outgoing_len = 0; + hostdata->default_sx_per = DEFAULT_SX_PER; + hostdata->no_sync = 0xff; /* sync defaults to off */ + hostdata->no_dma = 0; /* default is DMA enabled */ #ifdef PROC_INTERFACE - hostdata->proc = PR_VERSION|PR_INFO|PR_STATISTICS| - PR_CONNECTED|PR_INPUTQ|PR_DISCQ| - PR_STOP; + hostdata->proc = PR_VERSION | PR_INFO | PR_STATISTICS | + PR_CONNECTED | PR_INPUTQ | PR_DISCQ | PR_STOP; #ifdef PROC_STATISTICS - hostdata->dma_cnt = 0; - hostdata->pio_cnt = 0; - hostdata->int_cnt = 0; + hostdata->dma_cnt = 0; + hostdata->pio_cnt = 0; + hostdata->int_cnt = 0; #endif #endif + if (check_setup_args("nosync", &flags, &val, buf)) + hostdata->no_sync = val; - if (check_setup_args("nosync",&flags,&val,buf)) - hostdata->no_sync = val; - - if (check_setup_args("nodma",&flags,&val,buf)) - hostdata->no_dma = (val == -1) ? 1 : val; - - if (check_setup_args("period",&flags,&val,buf)) - hostdata->default_sx_per = sx_table[round_period((unsigned int)val)].period_ns; - - if (check_setup_args("disconnect",&flags,&val,buf)) { - if ((val >= DIS_NEVER) && (val <= DIS_ALWAYS)) - hostdata->disconnect = val; - else - hostdata->disconnect = DIS_ADAPTIVE; - } - - if (check_setup_args("level2",&flags,&val,buf)) - hostdata->level2 = val; - - if (check_setup_args("debug",&flags,&val,buf)) - hostdata->args = val & DB_MASK; - - if (check_setup_args("clock",&flags,&val,buf)) { - if (val>7 && val<11) - val = WD33C93_FS_8_10; - else if (val>11 && val<16) - val = WD33C93_FS_12_15; - else if (val>15 && val<21) - val = WD33C93_FS_16_20; - else - val = WD33C93_FS_8_10; - hostdata->clock_freq = val; - } - - if ((i = check_setup_args("next",&flags,&val,buf))) { - while (i) - setup_used[--i] = 1; - } + if (check_setup_args("nodma", &flags, &val, buf)) + hostdata->no_dma = (val == -1) ? 1 : val; + if (check_setup_args("period", &flags, &val, buf)) + hostdata->default_sx_per = + sx_table[round_period((unsigned int) val)].period_ns; + + if (check_setup_args("disconnect", &flags, &val, buf)) { + if ((val >= DIS_NEVER) && (val <= DIS_ALWAYS)) + hostdata->disconnect = val; + else + hostdata->disconnect = DIS_ADAPTIVE; + } + + if (check_setup_args("level2", &flags, &val, buf)) + hostdata->level2 = val; + + if (check_setup_args("debug", &flags, &val, buf)) + hostdata->args = val & DB_MASK; + + if (check_setup_args("clock", &flags, &val, buf)) { + if (val > 7 && val < 11) + val = WD33C93_FS_8_10; + else if (val > 11 && val < 16) + val = WD33C93_FS_12_15; + else if (val > 15 && val < 21) + val = WD33C93_FS_16_20; + else + val = WD33C93_FS_8_10; + hostdata->clock_freq = val; + } + + if ((i = check_setup_args("next", &flags, &val, buf))) { + while (i) + setup_used[--i] = 1; + } #ifdef PROC_INTERFACE - if (check_setup_args("proc",&flags,&val,buf)) - hostdata->proc = val; + if (check_setup_args("proc", &flags, &val, buf)) + hostdata->proc = val; #endif - - spin_lock_irq(&hostdata->lock); - reset_wd33c93(instance); - spin_unlock_irq(&hostdata->lock); - - printk("wd33c93-%d: chip=%s/%d no_sync=0x%x no_dma=%d",instance->host_no, - (hostdata->chip==C_WD33C93)?"WD33c93": - (hostdata->chip==C_WD33C93A)?"WD33c93A": - (hostdata->chip==C_WD33C93B)?"WD33c93B":"unknown", - hostdata->microcode,hostdata->no_sync,hostdata->no_dma); + spin_lock_irq(&hostdata->lock); + reset_wd33c93(instance); + spin_unlock_irq(&hostdata->lock); + + printk("wd33c93-%d: chip=%s/%d no_sync=0x%x no_dma=%d", + instance->host_no, + (hostdata->chip == C_WD33C93) ? "WD33c93" : (hostdata->chip == + C_WD33C93A) ? + "WD33c93A" : (hostdata->chip == + C_WD33C93B) ? "WD33c93B" : "unknown", + hostdata->microcode, hostdata->no_sync, hostdata->no_dma); #ifdef DEBUGGING_ON - printk(" debug_flags=0x%02x\n",hostdata->args); + printk(" debug_flags=0x%02x\n", hostdata->args); #else - printk(" debugging=OFF\n"); + printk(" debugging=OFF\n"); #endif - printk(" setup_args="); - for (i=0; ihostdata; + char *bp; + char tbuf[128]; + struct Scsi_Host *instance; + struct WD33C93_hostdata *hd; + Scsi_Cmnd *cmd; + int x, i; + static int stop = 0; + + instance = scsi_host_hn_get(hn); + if (!instance) { + printk("*** Hmm... Can't find host #%d!\n", hn); + return (-ESRCH); + } + hd = (struct WD33C93_hostdata *) instance->hostdata; /* If 'in' is TRUE we need to _read_ the proc file. We accept the following * keywords (same format as command-line, but only ONE per read): @@ -1893,148 +1943,146 @@ * nodma */ - if (in) { - buf[len] = '\0'; - bp = buf; - if (!strncmp(bp,"debug:",6)) { - bp += 6; - hd->args = simple_strtoul(bp,NULL,0) & DB_MASK; - } - else if (!strncmp(bp,"disconnect:",11)) { - bp += 11; - x = simple_strtoul(bp,NULL,0); - if (x < DIS_NEVER || x > DIS_ALWAYS) - x = DIS_ADAPTIVE; - hd->disconnect = x; - } - else if (!strncmp(bp,"period:",7)) { - bp += 7; - x = simple_strtoul(bp,NULL,0); - hd->default_sx_per = sx_table[round_period((unsigned int)x)].period_ns; - } - else if (!strncmp(bp,"resync:",7)) { - bp += 7; - x = simple_strtoul(bp,NULL,0); - for (i=0; i<7; i++) - if (x & (1<sync_stat[i] = SS_UNSET; - } - else if (!strncmp(bp,"proc:",5)) { - bp += 5; - hd->proc = simple_strtoul(bp,NULL,0); - } - else if (!strncmp(bp,"nodma:",6)) { - bp += 6; - hd->no_dma = simple_strtoul(bp,NULL,0); - } - else if (!strncmp(bp,"level2:",7)) { - bp += 7; - hd->level2 = simple_strtoul(bp,NULL,0); - } - return len; - } - - spin_lock_irq(&hd->lock); - bp = buf; - *bp = '\0'; - if (hd->proc & PR_VERSION) { - sprintf(tbuf,"\nVersion %s - %s. Compiled %s %s", - WD33C93_VERSION,WD33C93_DATE,__DATE__,__TIME__); - strcat(bp,tbuf); - } - if (hd->proc & PR_INFO) { - sprintf(tbuf,"\nclock_freq=%02x no_sync=%02x no_dma=%d", - hd->clock_freq,hd->no_sync,hd->no_dma); - strcat(bp,tbuf); - strcat(bp,"\nsync_xfer[] = "); - for (x=0; x<7; x++) { - sprintf(tbuf,"\t%02x",hd->sync_xfer[x]); - strcat(bp,tbuf); - } - strcat(bp,"\nsync_stat[] = "); - for (x=0; x<7; x++) { - sprintf(tbuf,"\t%02x",hd->sync_stat[x]); - strcat(bp,tbuf); - } - } + if (in) { + buf[len] = '\0'; + bp = buf; + if (!strncmp(bp, "debug:", 6)) { + bp += 6; + hd->args = simple_strtoul(bp, NULL, 0) & DB_MASK; + } else if (!strncmp(bp, "disconnect:", 11)) { + bp += 11; + x = simple_strtoul(bp, NULL, 0); + if (x < DIS_NEVER || x > DIS_ALWAYS) + x = DIS_ADAPTIVE; + hd->disconnect = x; + } else if (!strncmp(bp, "period:", 7)) { + bp += 7; + x = simple_strtoul(bp, NULL, 0); + hd->default_sx_per = + sx_table[round_period((unsigned int) x)].period_ns; + } else if (!strncmp(bp, "resync:", 7)) { + bp += 7; + x = simple_strtoul(bp, NULL, 0); + for (i = 0; i < 7; i++) + if (x & (1 << i)) + hd->sync_stat[i] = SS_UNSET; + } else if (!strncmp(bp, "proc:", 5)) { + bp += 5; + hd->proc = simple_strtoul(bp, NULL, 0); + } else if (!strncmp(bp, "nodma:", 6)) { + bp += 6; + hd->no_dma = simple_strtoul(bp, NULL, 0); + } else if (!strncmp(bp, "level2:", 7)) { + bp += 7; + hd->level2 = simple_strtoul(bp, NULL, 0); + } + return len; + } + + spin_lock_irq(&hd->lock); + bp = buf; + *bp = '\0'; + if (hd->proc & PR_VERSION) { + sprintf(tbuf, "\nVersion %s - %s. Compiled %s %s", + WD33C93_VERSION, WD33C93_DATE, __DATE__, __TIME__); + strcat(bp, tbuf); + } + if (hd->proc & PR_INFO) { + sprintf(tbuf, "\nclock_freq=%02x no_sync=%02x no_dma=%d", + hd->clock_freq, hd->no_sync, hd->no_dma); + strcat(bp, tbuf); + strcat(bp, "\nsync_xfer[] = "); + for (x = 0; x < 7; x++) { + sprintf(tbuf, "\t%02x", hd->sync_xfer[x]); + strcat(bp, tbuf); + } + strcat(bp, "\nsync_stat[] = "); + for (x = 0; x < 7; x++) { + sprintf(tbuf, "\t%02x", hd->sync_stat[x]); + strcat(bp, tbuf); + } + } #ifdef PROC_STATISTICS - if (hd->proc & PR_STATISTICS) { - strcat(bp,"\ncommands issued: "); - for (x=0; x<7; x++) { - sprintf(tbuf,"\t%ld",hd->cmd_cnt[x]); - strcat(bp,tbuf); - } - strcat(bp,"\ndisconnects allowed:"); - for (x=0; x<7; x++) { - sprintf(tbuf,"\t%ld",hd->disc_allowed_cnt[x]); - strcat(bp,tbuf); - } - strcat(bp,"\ndisconnects done: "); - for (x=0; x<7; x++) { - sprintf(tbuf,"\t%ld",hd->disc_done_cnt[x]); - strcat(bp,tbuf); - } - sprintf(tbuf,"\ninterrupts: %ld, DATA_PHASE ints: %ld DMA, %ld PIO", - hd->int_cnt,hd->dma_cnt,hd->pio_cnt); - strcat(bp,tbuf); - } + if (hd->proc & PR_STATISTICS) { + strcat(bp, "\ncommands issued: "); + for (x = 0; x < 7; x++) { + sprintf(tbuf, "\t%ld", hd->cmd_cnt[x]); + strcat(bp, tbuf); + } + strcat(bp, "\ndisconnects allowed:"); + for (x = 0; x < 7; x++) { + sprintf(tbuf, "\t%ld", hd->disc_allowed_cnt[x]); + strcat(bp, tbuf); + } + strcat(bp, "\ndisconnects done: "); + for (x = 0; x < 7; x++) { + sprintf(tbuf, "\t%ld", hd->disc_done_cnt[x]); + strcat(bp, tbuf); + } + sprintf(tbuf, + "\ninterrupts: %ld, DATA_PHASE ints: %ld DMA, %ld PIO", + hd->int_cnt, hd->dma_cnt, hd->pio_cnt); + strcat(bp, tbuf); + } #endif - if (hd->proc & PR_CONNECTED) { - strcat(bp,"\nconnected: "); - if (hd->connected) { - cmd = (Scsi_Cmnd *)hd->connected; - sprintf(tbuf," %ld-%d:%d(%02x)", - cmd->pid, cmd->target, cmd->lun, cmd->cmnd[0]); - strcat(bp,tbuf); - } - } - if (hd->proc & PR_INPUTQ) { - strcat(bp,"\ninput_Q: "); - cmd = (Scsi_Cmnd *)hd->input_Q; - while (cmd) { - sprintf(tbuf," %ld-%d:%d(%02x)", - cmd->pid, cmd->target, cmd->lun, cmd->cmnd[0]); - strcat(bp,tbuf); - cmd = (Scsi_Cmnd *)cmd->host_scribble; - } - } - if (hd->proc & PR_DISCQ) { - strcat(bp,"\ndisconnected_Q:"); - cmd = (Scsi_Cmnd *)hd->disconnected_Q; - while (cmd) { - sprintf(tbuf," %ld-%d:%d(%02x)", - cmd->pid, cmd->target, cmd->lun, cmd->cmnd[0]); - strcat(bp,tbuf); - cmd = (Scsi_Cmnd *)cmd->host_scribble; - } - } - strcat(bp,"\n"); - spin_unlock_irq(&hd->lock); - *start = buf; - if (stop) { - stop = 0; - return 0; - } - if (off > 0x40000) /* ALWAYS stop after 256k bytes have been read */ - stop = 1;; - if (hd->proc & PR_STOP) /* stop every other time */ - stop = 1; - return strlen(bp); - -#else /* PROC_INTERFACE */ - - return 0; - -#endif /* PROC_INTERFACE */ + if (hd->proc & PR_CONNECTED) { + strcat(bp, "\nconnected: "); + if (hd->connected) { + cmd = (Scsi_Cmnd *) hd->connected; + sprintf(tbuf, " %ld-%d:%d(%02x)", + cmd->pid, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); + strcat(bp, tbuf); + } + } + if (hd->proc & PR_INPUTQ) { + strcat(bp, "\ninput_Q: "); + cmd = (Scsi_Cmnd *) hd->input_Q; + while (cmd) { + sprintf(tbuf, " %ld-%d:%d(%02x)", + cmd->pid, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); + strcat(bp, tbuf); + cmd = (Scsi_Cmnd *) cmd->host_scribble; + } + } + if (hd->proc & PR_DISCQ) { + strcat(bp, "\ndisconnected_Q:"); + cmd = (Scsi_Cmnd *) hd->disconnected_Q; + while (cmd) { + sprintf(tbuf, " %ld-%d:%d(%02x)", + cmd->pid, cmd->device->id, cmd->device->lun, cmd->cmnd[0]); + strcat(bp, tbuf); + cmd = (Scsi_Cmnd *) cmd->host_scribble; + } + } + strcat(bp, "\n"); + spin_unlock_irq(&hd->lock); + *start = buf; + if (stop) { + stop = 0; + return 0; + } + if (off > 0x40000) /* ALWAYS stop after 256k bytes have been read */ + stop = 1;; + if (hd->proc & PR_STOP) /* stop every other time */ + stop = 1; + return strlen(bp); + +#else /* PROC_INTERFACE */ + + return 0; + +#endif /* PROC_INTERFACE */ } -#ifdef MODULE -int init_module(void) { return 0; } -void cleanup_module(void) {} -#endif -void wd33c93_release(void) +void +wd33c93_release(void) { } -MODULE_LICENSE("GPL"); +EXPORT_SYMBOL(wd33c93_reset); +EXPORT_SYMBOL(wd33c93_init); +EXPORT_SYMBOL(wd33c93_release); +EXPORT_SYMBOL(wd33c93_abort); +EXPORT_SYMBOL(wd33c93_queuecommand); +EXPORT_SYMBOL(wd33c93_intr); diff -Nru a/drivers/serial/21285.c b/drivers/serial/21285.c --- a/drivers/serial/21285.c Thu Feb 27 01:44:27 2003 +++ b/drivers/serial/21285.c Thu Feb 27 01:44:27 2003 @@ -237,7 +237,7 @@ struct termios *old) { unsigned long flags; - unsigned int quot, h_lcr; + unsigned int baud, quot, h_lcr; /* * We don't support modem control lines. @@ -253,7 +253,8 @@ /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); switch (termios->c_cflag & CSIZE) { case CS5: @@ -286,7 +287,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); /* * Which character status flags are we interested in? diff -Nru a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h --- a/drivers/serial/68328serial.h Thu Feb 27 01:44:30 2003 +++ b/drivers/serial/68328serial.h Thu Feb 27 01:44:30 2003 @@ -93,7 +93,7 @@ * board I would assume that RXRE is the safest setting. * * For EZ328 I use RXHE (Half empty) interrupt to reduce the number of - * interrupts. RXFE (receive queue full) causes the system to loose data + * interrupts. RXFE (receive queue full) causes the system to lose data * at least at 115200 baud * * If your board is busy doing other stuff, you might consider to use diff -Nru a/drivers/serial/8250.c b/drivers/serial/8250.c --- a/drivers/serial/8250.c Thu Feb 27 01:44:17 2003 +++ b/drivers/serial/8250.c Thu Feb 27 01:44:17 2003 @@ -159,7 +159,8 @@ { "16C950/954", 128, UART_CLEAR_FIFO | UART_USE_FIFO }, { "ST16654", 64, UART_CLEAR_FIFO | UART_USE_FIFO | UART_STARTECH }, { "XR16850", 128, UART_CLEAR_FIFO | UART_USE_FIFO | UART_STARTECH }, - { "RSA", 2048, UART_CLEAR_FIFO | UART_USE_FIFO } + { "RSA", 2048, UART_CLEAR_FIFO | UART_USE_FIFO }, + { "NS16550A", 16, UART_CLEAR_FIFO | UART_USE_FIFO | UART_NATSEMI } }; static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) @@ -482,6 +483,40 @@ } /* + * Check for a National Semiconductor SuperIO chip. + * Attempt to switch to bank 2, read the value of the LOOP bit + * from EXCR1. Switch back to bank 0, change it in MCR. Then + * switch back to bank 2, read it from EXCR1 again and check + * it's changed. If so, set baud_base in EXCR2 to 921600. + */ + serial_outp(up, UART_LCR, 0); + status1 = serial_in(up, UART_MCR); + serial_outp(up, UART_LCR, 0xE0); + status2 = serial_in(up, 0x02); /* EXCR1 */ + + if (!((status2 ^ status1) & UART_MCR_LOOP)) { + serial_outp(up, UART_LCR, 0); + serial_outp(up, UART_MCR, status1 ^ UART_MCR_LOOP); + serial_outp(up, UART_LCR, 0xE0); + status2 = serial_in(up, 0x02); /* EXCR1 */ + serial_outp(up, UART_LCR, 0); + serial_outp(up, UART_MCR, status1); + + if ((status2 ^ status1) & UART_MCR_LOOP) { + serial_outp(up, UART_LCR, 0xE0); + status1 = serial_in(up, 0x04); /* EXCR1 */ + status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */ + status1 |= 0x10; /* 1.625 divisor for baud_base --> 921600 */ + serial_outp(up, 0x04, status1); + serial_outp(up, UART_LCR, 0); + + up->port.type = PORT_NS16550A; + up->port.uartclk = 921600*16; + return; + } + } + + /* * No EFR. Try to detect a TI16750, which only sets bit 5 of * the IIR when 64 byte FIFO mode is enabled when DLAB is set. * Try setting it with and without DLAB set. Cheap clones @@ -1241,7 +1276,7 @@ /* * Finally, enable interrupts. Note: Modem status interrupts - * are set via set_termios(), which will be occuring imminently + * are set via set_termios(), which will be occurring imminently * anyway, so we don't enable them here. */ up->ier = UART_IER_RLSI | UART_IER_RDI; @@ -1318,6 +1353,26 @@ serial_unlink_irq_chain(up); } +static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud) +{ + unsigned int quot; + + /* + * Handle magic divisors for baud rates above baud_base on + * SMSC SuperIO chips. + */ + if ((port->flags & UPF_MAGIC_MULTIPLIER) && + baud == (port->uartclk/4)) + quot = 0x8001; + else if ((port->flags & UPF_MAGIC_MULTIPLIER) && + baud == (port->uartclk/8)) + quot = 0x8002; + else + quot = uart_get_divisor(port, baud); + + return quot; +} + static void serial8250_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) @@ -1325,7 +1380,7 @@ struct uart_8250_port *up = (struct uart_8250_port *)port; unsigned char cval, fcr = 0; unsigned long flags; - unsigned int quot; + unsigned int baud, quot; switch (termios->c_cflag & CSIZE) { case CS5: @@ -1357,7 +1412,8 @@ /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = serial8250_get_divisor(port, baud); /* * Work around a bug in the Oxford Semiconductor 952 rev B @@ -1369,7 +1425,7 @@ quot ++; if (uart_config[up->port.type].flags & UART_USE_FIFO) { - if ((up->port.uartclk / quot) < (2400 * 16)) + if (baud < 2400) fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1; #ifdef CONFIG_SERIAL_8250_RSA else if (up->port.type == PORT_RSA) @@ -1390,7 +1446,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR; if (termios->c_iflag & INPCK) @@ -1434,7 +1490,13 @@ serial_outp(up, UART_EFR, termios->c_cflag & CRTSCTS ? UART_EFR_CTS :0); } - serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */ + + if (uart_config[up->port.type].flags & UART_NATSEMI) { + /* Switch to bank 2 not bank 1, to avoid resetting EXCR2 */ + serial_outp(up, UART_LCR, 0xe0); + } else { + serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */ + } serial_outp(up, UART_DLL, quot & 0xff); /* LS of divisor */ serial_outp(up, UART_DLM, quot >> 8); /* MS of divisor */ if (up->port.type == PORT_16750) @@ -1989,7 +2051,7 @@ * port exists and is in use an error is returned. If the port * is not currently in the table it is added. * - * The port is then probed and if neccessary the IRQ is autodetected + * The port is then probed and if necessary the IRQ is autodetected * If this fails an error is returned. * * On success the port is ready to use and the line number is returned. diff -Nru a/drivers/serial/amba.c b/drivers/serial/amba.c --- a/drivers/serial/amba.c Thu Feb 27 01:44:18 2003 +++ b/drivers/serial/amba.c Thu Feb 27 01:44:18 2003 @@ -408,12 +408,13 @@ { unsigned int lcr_h, old_cr; unsigned long flags; - unsigned int quot; + unsigned int baud, quot; /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); switch (termios->c_cflag & CSIZE) { case CS5: @@ -444,7 +445,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); port->read_status_mask = AMBA_UARTRSR_OE; if (termios->c_iflag & INPCK) diff -Nru a/drivers/serial/anakin.c b/drivers/serial/anakin.c --- a/drivers/serial/anakin.c Thu Feb 27 01:44:20 2003 +++ b/drivers/serial/anakin.c Thu Feb 27 01:44:20 2003 @@ -287,7 +287,7 @@ struct termios *old) { unsigned long flags; - unsigned int quot; + unsigned int baud, quot; /* * We don't support parity, stop bits, or anything other @@ -304,11 +304,12 @@ /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); spin_lock_irqsave(&port->lock, flags); - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); while (!(anakin_in(port, 0x10) & TXEMPTY)) barrier(); diff -Nru a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c --- a/drivers/serial/clps711x.c Thu Feb 27 01:44:21 2003 +++ b/drivers/serial/clps711x.c Thu Feb 27 01:44:21 2003 @@ -320,7 +320,7 @@ clps711xuart_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) { - unsigned int ubrlcr, quot; + unsigned int ubrlcr, baud, quot; unsigned long flags; /* @@ -331,7 +331,8 @@ /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); switch (termios->c_cflag & CSIZE) { case CS5: @@ -362,7 +363,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); port->read_status_mask = UARTDR_OVERR; if (termios->c_iflag & INPCK) diff -Nru a/drivers/serial/core.c b/drivers/serial/core.c --- a/drivers/serial/core.c Thu Feb 27 01:44:20 2003 +++ b/drivers/serial/core.c Thu Feb 27 01:44:20 2003 @@ -271,7 +271,7 @@ */ void uart_update_timeout(struct uart_port *port, unsigned int cflag, - unsigned int quot) + unsigned int baud) { unsigned int bits; @@ -305,7 +305,7 @@ * Figure the timeout to send the above number of bits. * Add .02 seconds of slop */ - port->timeout = (HZ * bits) / (port->uartclk / (16 * quot)) + HZ/50; + port->timeout = (HZ * bits) / baud + HZ/50; } EXPORT_SYMBOL(uart_update_timeout); @@ -321,6 +321,12 @@ * Decode the termios structure into a numeric baud rate, * taking account of the magic 38400 baud rate (with spd_* * flags), and mapping the %B0 rate to 9600 baud. + * + * If the new baud rate is invalid, try the old termios setting. + * If it's still invalid, we try 9600 baud. + * + * Update the @termios structure to reflect the baud rate + * we're actually going to be using. */ unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios, @@ -383,26 +389,14 @@ /** * uart_get_divisor - return uart clock divisor * @port: uart_port structure describing the port. - * @termios: desired termios settings - * @old_termios: the original port settings, or NULL - * - * Calculate the uart clock divisor for the port. If the - * divisor is invalid, try the old termios setting. If - * the divisor is still invalid, we try 9600 baud. + * @baud: desired baud rate * - * Update the @termios structure to reflect the baud rate - * we're actually going to be using. - * - * If 9600 baud fails, we return a zero divisor. + * Calculate the uart clock divisor for the port. */ unsigned int -uart_get_divisor(struct uart_port *port, struct termios *termios, - struct termios *old_termios) +uart_get_divisor(struct uart_port *port, unsigned int baud) { - unsigned int quot, baud, max = port->uartclk / 16; - - /* Determine divisor based on baud rate */ - baud = uart_get_baud_rate(port, termios, old_termios, 0, max); + unsigned int quot; /* * Old custom speed handling. @@ -832,8 +826,17 @@ goto exit; if (info->flags & UIF_INITIALIZED) { if (((old_flags ^ port->flags) & UPF_SPD_MASK) || - old_custom_divisor != port->custom_divisor) + old_custom_divisor != port->custom_divisor) { + /* If they're setting up a custom divisor or speed, + * instead of clearing it, then bitch about it. No + * need to rate-limit; it's CAP_SYS_ADMIN only. */ + if (port->flags & UPF_SPD_MASK) { + printk(KERN_NOTICE "%s sets custom speed on %s%d. This is deprecated.\n", + current->comm, info->tty->driver.name, + info->port->line); + } uart_change_speed(info, NULL); + } } else retval = uart_startup(info, 1); exit: @@ -2024,11 +2027,11 @@ switch (rqst) { case PM_SUSPEND: case PM_RESUME: - err = uart_pm_set_state(state, (int)data, dev->state); + err = uart_pm_set_state(state, (int)(long)data, dev->state); break; case PM_SET_WAKEUP: - err = uart_pm_set_wakeup(state, (int)data); + err = uart_pm_set_wakeup(state, (int)(long)data); break; } return err; diff -Nru a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c --- a/drivers/serial/sa1100.c Thu Feb 27 01:44:18 2003 +++ b/drivers/serial/sa1100.c Thu Feb 27 01:44:18 2003 @@ -327,7 +327,7 @@ sa1100_rx_chars(sport, regs); } - /* Clear the relevent break bits */ + /* Clear the relevant break bits */ if (status & (UTSR0_RBB | UTSR0_REB)) UART_PUT_UTSR0(sport, status & (UTSR0_RBB | UTSR0_REB)); @@ -441,7 +441,7 @@ { struct sa1100_port *sport = (struct sa1100_port *)port; unsigned long flags; - unsigned int utcr0, old_utcr3, quot; + unsigned int utcr0, old_utcr3, baud, quot; unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8; /* @@ -470,7 +470,8 @@ /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); spin_lock_irqsave(&sport->port.lock, flags); @@ -507,7 +508,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); /* * disable interrupts and drain transmitter diff -Nru a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c --- a/drivers/serial/sunsu.c Thu Feb 27 01:44:20 2003 +++ b/drivers/serial/sunsu.c Thu Feb 27 01:44:20 2003 @@ -713,7 +713,7 @@ /* * Finally, enable interrupts. Note: Modem status interrupts - * are set via set_termios(), which will be occuring imminently + * are set via set_termios(), which will be occurring imminently * anyway, so we don't enable them here. */ up->ier = UART_IER_RLSI | UART_IER_RDI; @@ -852,7 +852,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, cflag, quot); + uart_update_timeout(port, cflag, (port->uartclk / (16 * quot))); up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR; if (iflag & INPCK) @@ -919,12 +919,13 @@ sunsu_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) { - unsigned int quot; + unsigned int baud, quot; /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); sunsu_change_speed(port, termios->c_cflag, termios->c_iflag, quot); } diff -Nru a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c --- a/drivers/serial/sunzilog.c Thu Feb 27 01:44:31 2003 +++ b/drivers/serial/sunzilog.c Thu Feb 27 01:44:31 2003 @@ -48,7 +48,7 @@ #include "sunzilog.h" /* On 32-bit sparcs we need to delay after register accesses - * to accomodate sun4 systems, but we do not need to flush writes. + * to accommodate sun4 systems, but we do not need to flush writes. * On 64-bit sparc we only need to flush single writes to ensure * completion. */ diff -Nru a/drivers/serial/uart00.c b/drivers/serial/uart00.c --- a/drivers/serial/uart00.c Thu Feb 27 01:44:22 2003 +++ b/drivers/serial/uart00.c Thu Feb 27 01:44:22 2003 @@ -317,7 +317,7 @@ uart00_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) { - unsigned int uart_mc, old_ies, quot; + unsigned int uart_mc, old_ies, baud, quot; unsigned long flags; /* @@ -328,7 +328,8 @@ /* * Ask the core to calculate the divisor for us. */ - quot = uart_get_divisor(port, termios, old); + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = uart_get_divisor(port, baud); /* byte size and parity */ switch (termios->c_cflag & CSIZE) { @@ -358,7 +359,7 @@ /* * Update the per-port timeout. */ - uart_update_timeout(port, termios->c_cflag, quot); + uart_update_timeout(port, termios->c_cflag, baud); port->read_status_mask = UART_RDS_OE_MSK; if (termios->c_iflag & INPCK) diff -Nru a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c --- a/drivers/telephony/ixj.c Thu Feb 27 01:44:17 2003 +++ b/drivers/telephony/ixj.c Thu Feb 27 01:44:17 2003 @@ -7717,7 +7717,7 @@ printk("pnp attach failed %d \n", result); break; } - if (pnp_activate_dev(dev, NULL) < 0) { + if (pnp_activate_dev(dev) < 0) { printk("pnp activate failed (out of resources?)\n"); pnp_device_detach(dev); return -ENOMEM; diff -Nru a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c --- a/drivers/usb/class/bluetty.c Thu Feb 27 01:44:27 2003 +++ b/drivers/usb/class/bluetty.c Thu Feb 27 01:44:27 2003 @@ -267,7 +267,7 @@ { if (!bluetooth || bluetooth_paranoia_check (bluetooth, function)) { - /* then say that we dont have a valid usb_bluetooth thing, which will + /* then say that we don't have a valid usb_bluetooth thing, which will * end up generating -ENODEV return values */ return NULL; } diff -Nru a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c --- a/drivers/usb/host/ehci-sched.c Thu Feb 27 01:44:21 2003 +++ b/drivers/usb/host/ehci-sched.c Thu Feb 27 01:44:21 2003 @@ -417,7 +417,7 @@ if (unlikely (ehci->pshadow [frame].ptr != 0)) { // FIXME -- just link toward the end, before any qh with a shorter period, -// AND accomodate it already having been linked here (after some other qh) +// AND accommodate it already having been linked here (after some other qh) // AS WELL AS updating the schedule checking logic BUG (); diff -Nru a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c --- a/drivers/usb/image/mdc800.c Thu Feb 27 01:44:24 2003 +++ b/drivers/usb/image/mdc800.c Thu Feb 27 01:44:24 2003 @@ -213,7 +213,7 @@ /* - * Checks wether the camera responds busy + * Checks whether the camera responds busy */ static int mdc800_isBusy (char* ch) { @@ -229,7 +229,7 @@ /* - * Checks wether the Camera is ready + * Checks whether the Camera is ready */ static int mdc800_isReady (char *ch) { diff -Nru a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c --- a/drivers/usb/image/microtek.c Thu Feb 27 01:44:31 2003 +++ b/drivers/usb/image/microtek.c Thu Feb 27 01:44:31 2003 @@ -572,7 +572,7 @@ MTS_DEBUG_GOT_HERE(); context->srb->result = DID_ABORT<<16; } else { - /* A genuine error has occured */ + /* A genuine error has occurred */ MTS_DEBUG_GOT_HERE(); context->srb->result = DID_ERROR<<16; diff -Nru a/drivers/usb/media/konicawc.c b/drivers/usb/media/konicawc.c --- a/drivers/usb/media/konicawc.c Thu Feb 27 01:44:16 2003 +++ b/drivers/usb/media/konicawc.c Thu Feb 27 01:44:16 2003 @@ -266,7 +266,7 @@ sts &= ~0x40; } - /* work out the button status, but dont do + /* work out the button status, but don't do anything with it for now */ if(button != cam->buttonsts) { @@ -607,7 +607,7 @@ } if(newsize > MAX_FRAME_SIZE) { - DEBUG(1, "couldnt find size %d,%d", x, y); + DEBUG(1, "couldn't find size %d,%d", x, y); return -EINVAL; } @@ -806,7 +806,7 @@ while(i--) { usb_free_urb(cam->sts_urb[i]); } - err("cant allocate urbs"); + err("can't allocate urbs"); return -ENOMEM; } } diff -Nru a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c --- a/drivers/usb/misc/auerswald.c Thu Feb 27 01:44:22 2003 +++ b/drivers/usb/misc/auerswald.c Thu Feb 27 01:44:22 2003 @@ -1946,7 +1946,7 @@ if (intf->altsetting->desc.bInterfaceNumber != 0) return -ENODEV; - /* allocate memory for our device and intialize it */ + /* allocate memory for our device and initialize it */ cp = kmalloc (sizeof(auerswald_t), GFP_KERNEL); if (cp == NULL) { err ("out of memory"); diff -Nru a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c --- a/drivers/usb/serial/kobil_sct.c Thu Feb 27 01:44:28 2003 +++ b/drivers/usb/serial/kobil_sct.c Thu Feb 27 01:44:28 2003 @@ -159,7 +159,7 @@ } usb_set_serial_port_data(serial->port, priv); - // search for the neccessary endpoints + // search for the necessary endpoints pdev = serial->dev; actconfig = pdev->actconfig; interface = actconfig->interface; diff -Nru a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h --- a/drivers/usb/serial/usb-serial.h Thu Feb 27 01:44:31 2003 +++ b/drivers/usb/serial/usb-serial.h Thu Feb 27 01:44:31 2003 @@ -342,7 +342,7 @@ if (!port || port_paranoia_check (port, function) || serial_paranoia_check (port->serial, function)) { - /* then say that we dont have a valid usb_serial thing, which will + /* then say that we don't have a valid usb_serial thing, which will * end up genrating -ENODEV return values */ return NULL; } diff -Nru a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c --- a/drivers/usb/storage/freecom.c Thu Feb 27 01:44:31 2003 +++ b/drivers/usb/storage/freecom.c Thu Feb 27 01:44:31 2003 @@ -240,7 +240,7 @@ * may not work, but that is a condition that should never happen. */ while (fst->Status & FCM_STATUS_BUSY) { - US_DEBUGP("20 second USB/ATAPI bridge TIMEOUT occured!\n"); + US_DEBUGP("20 second USB/ATAPI bridge TIMEOUT occurred!\n"); US_DEBUGP("fst->Status is %x\n", fst->Status); /* Get the status again */ diff -Nru a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c --- a/drivers/usb/usb-skeleton.c Thu Feb 27 01:44:22 2003 +++ b/drivers/usb/usb-skeleton.c Thu Feb 27 01:44:22 2003 @@ -498,7 +498,7 @@ goto exit; } - /* allocate memory for our device state and intialize it */ + /* allocate memory for our device state and initialize it */ dev = kmalloc (sizeof(struct usb_skel), GFP_KERNEL); if (dev == NULL) { err ("Out of memory"); diff -Nru a/drivers/video/amifb.c b/drivers/video/amifb.c --- a/drivers/video/amifb.c Thu Feb 27 01:44:28 2003 +++ b/drivers/video/amifb.c Thu Feb 27 01:44:28 2003 @@ -274,9 +274,9 @@ display of sprites, I use the following policy on horizontal panning and the hardware cursor: - - if you want to start display DMA too early, you loose the ability to + - if you want to start display DMA too early, you lose the ability to do smooth horizontal panning (xpanstep 1 -> 64). - - if you want to go even further, you loose the hardware cursor too. + - if you want to go even further, you lose the hardware cursor too. IMHO a hardware cursor is more important for X than horizontal scrolling, so that's my motivation. diff -Nru a/drivers/video/controlfb.c b/drivers/video/controlfb.c --- a/drivers/video/controlfb.c Thu Feb 27 01:44:20 2003 +++ b/drivers/video/controlfb.c Thu Feb 27 01:44:20 2003 @@ -554,7 +554,7 @@ /* - * Called from fbmem.c for probing & intializing + * Called from fbmem.c for probing & initializing */ int __init control_init(void) { diff -Nru a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c --- a/drivers/video/cyber2000fb.c Thu Feb 27 01:44:20 2003 +++ b/drivers/video/cyber2000fb.c Thu Feb 27 01:44:20 2003 @@ -1697,7 +1697,7 @@ unsigned char val; #if defined(__sparc_v9__) -#error "You loose, consult DaveM." +#error "You lose, consult DaveM." #elif defined(__sparc__) /* * SPARC does not have an "outb" instruction, so we generate diff -Nru a/drivers/video/macfb.c b/drivers/video/macfb.c --- a/drivers/video/macfb.c Thu Feb 27 01:44:18 2003 +++ b/drivers/video/macfb.c Thu Feb 27 01:44:18 2003 @@ -223,7 +223,7 @@ local_irq_save(flags); /* fbdev will set an entire colourmap, but X won't. Hopefully - this should accomodate both of them */ + this should accommodate both of them */ if (regno != lastreg+1) { int i; diff -Nru a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c --- a/drivers/video/pvr2fb.c Thu Feb 27 01:44:18 2003 +++ b/drivers/video/pvr2fb.c Thu Feb 27 01:44:18 2003 @@ -15,7 +15,7 @@ * an odd scheme for converting hardware values to/from framebuffer values, here are * some hacked-up formulas: * - * The Dreamcast has screen offsets from each side of it's four borders and the start + * The Dreamcast has screen offsets from each side of its four borders and the start * offsets of the display window. I used these values to calculate 'pseudo' values * (think of them as placeholders) for the fb video mode, so that when it came time * to convert these values back into their hardware values, I could just add mode- diff -Nru a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c --- a/drivers/video/retz3fb.c Thu Feb 27 01:44:28 2003 +++ b/drivers/video/retz3fb.c Thu Feb 27 01:44:28 2003 @@ -1379,7 +1379,7 @@ zinfo->base = ioremap(board_addr, board_size); zinfo->regs = zinfo->base; zinfo->fbmem = zinfo->base + VIDEO_MEM_OFFSET; - /* Get memory size - for now we asume its a 4MB board */ + /* Get memory size - for now we asume it's a 4MB board */ zinfo->fbsize = 0x00400000; /* 4 MB */ zinfo->physregs = board_addr; zinfo->physfbmem = board_addr + VIDEO_MEM_OFFSET; diff -Nru a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c --- a/drivers/video/sa1100fb.c Thu Feb 27 01:44:20 2003 +++ b/drivers/video/sa1100fb.c Thu Feb 27 01:44:20 2003 @@ -1370,7 +1370,7 @@ #ifdef CONFIG_SA1100_HUW_WEBPANEL #error Move me into __sa1100fb_lcd_power and/or __sa1100fb_backlight_power if (machine_is_huw_webpanel()) { - // dont forget to set the control lines to zero (?) + // don't forget to set the control lines to zero (?) DPRINTK("ShutDown HuW LCD controller\n"); BCR_clear(BCR_TFT_ENA + BCR_CCFL_POW + BCR_PWM_BACKLIGHT); } diff -Nru a/drivers/video/sstfb.c b/drivers/video/sstfb.c --- a/drivers/video/sstfb.c Thu Feb 27 01:44:25 2003 +++ b/drivers/video/sstfb.c Thu Feb 27 01:44:25 2003 @@ -35,7 +35,7 @@ wich one should i use ? is there any preferred one ? It seems ARGB is the one ... -TODO: in set_var check the validity of timings (hsync vsync)... --TODO: check and recheck the use of sst_wait_idle : we dont flush the fifo via +-TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via a nop command. so it's ok as long as the commands we pass don't go through the fifo. warning: issuing a nop command seems to need pci_fifo -FIXME: in case of failure in the init sequence, be sure we return to a safe diff -Nru a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c --- a/fs/adfs/dir_f.c Thu Feb 27 01:44:25 2003 +++ b/fs/adfs/dir_f.c Thu Feb 27 01:44:25 2003 @@ -259,7 +259,7 @@ /* * get a directory entry. Note that the caller is responsible - * for holding the relevent locks. + * for holding the relevant locks. */ int __adfs_dir_get(struct adfs_dir *dir, int pos, struct object_info *obj) diff -Nru a/fs/afs/vnode.c b/fs/afs/vnode.c --- a/fs/afs/vnode.c Thu Feb 27 01:44:22 2003 +++ b/fs/afs/vnode.c Thu Feb 27 01:44:22 2003 @@ -272,7 +272,7 @@ /*****************************************************************************/ /* * break any outstanding callback on a vnode - * - only relevent to server that issued it + * - only relevant to server that issued it */ int afs_vnode_give_up_callback(afs_vnode_t *vnode) { diff -Nru a/fs/befs/ChangeLog b/fs/befs/ChangeLog --- a/fs/befs/ChangeLog Thu Feb 27 01:44:18 2003 +++ b/fs/befs/ChangeLog Thu Feb 27 01:44:18 2003 @@ -117,7 +117,7 @@ * Rewrote datastream positon lookups. (datastream.c) [WD] -* Moved the TODO list to it's own file. +* Moved the TODO list to its own file. Version 0.50 (2001-11-13) diff -Nru a/fs/befs/btree.c b/fs/befs/btree.c --- a/fs/befs/btree.c Thu Feb 27 01:44:17 2003 +++ b/fs/befs/btree.c Thu Feb 27 01:44:17 2003 @@ -41,7 +41,7 @@ /* Befs B+tree structure: * * The first thing in the tree is the tree superblock. It tells you - * all kinds of usefull things about the tree, like where the rootnode + * all kinds of useful things about the tree, like where the rootnode * is located, and the size of the nodes (always 1024 with current version * of BeOS). * diff -Nru a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c --- a/fs/befs/linuxvfs.c Thu Feb 27 01:44:22 2003 +++ b/fs/befs/linuxvfs.c Thu Feb 27 01:44:22 2003 @@ -541,7 +541,7 @@ wchar_t uni; int unilen, utflen; char *result; - int maxlen = in_len; /* The utf8->nls conversion cant make more chars */ + int maxlen = in_len; /* The utf8->nls conversion can't make more chars */ befs_debug(sb, "---> utf2nls()"); diff -Nru a/fs/bio.c b/fs/bio.c --- a/fs/bio.c Thu Feb 27 01:44:25 2003 +++ b/fs/bio.c Thu Feb 27 01:44:25 2003 @@ -334,7 +334,7 @@ * @bdev: I/O target * * Return the approximate number of pages we can send to this target. - * There's no guarentee that you will be able to fit this number of pages + * There's no guarantee that you will be able to fit this number of pages * into a bio, it does not account for dynamic restrictions that vary * on offset. */ @@ -383,7 +383,7 @@ return 0; /* - * we might loose a segment or two here, but rather that than + * we might lose a segment or two here, but rather that than * make this too complex. */ retry_segments: diff -Nru a/fs/buffer.c b/fs/buffer.c --- a/fs/buffer.c Thu Feb 27 01:44:24 2003 +++ b/fs/buffer.c Thu Feb 27 01:44:24 2003 @@ -2495,7 +2495,7 @@ /* * The page straddles i_size. It must be zeroed out on each and every - * writepage invokation because it may be mmapped. "A file is mapped + * writepage invocation because it may be mmapped. "A file is mapped * in multiples of the page size. For a file that is not a multiple of * the page size, the remaining memory is zeroed when mapped, and * writes to that region are not written out to the file." @@ -2584,7 +2584,7 @@ * BH_Lock state bit), any buffer that appears to be clean when doing a * write request, and any buffer that appears to be up-to-date when doing * read request. Further it marks as clean buffers that are processed for - * writing (the buffer cache wont assume that they are actually clean until + * writing (the buffer cache won't assume that they are actually clean until * the buffer gets unlocked). * * ll_rw_block sets b_end_io to simple completion handler that marks diff -Nru a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h --- a/fs/cifs/cifs_unicode.h Thu Feb 27 01:44:30 2003 +++ b/fs/cifs/cifs_unicode.h Thu Feb 27 01:44:30 2003 @@ -99,7 +99,7 @@ * UniStrchr: Find a character in a string * * Returns: - * Address of first occurance of character in string + * Address of first occurrence of character in string * or NULL if the character is not in the string */ static inline wchar_t * diff -Nru a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h --- a/fs/cifs/cifspdu.h Thu Feb 27 01:44:28 2003 +++ b/fs/cifs/cifspdu.h Thu Feb 27 01:44:28 2003 @@ -1245,7 +1245,7 @@ __u8 Reserved3; __u16 SubCommand; /* one setup word */ __u16 ByteCount; - __u8 Pad[3]; /* Win2K has sent 0x0F01 (max resp length perhaps?) followed by one byte pad - doesnt seem to matter though */ + __u8 Pad[3]; /* Win2K has sent 0x0F01 (max resp length perhaps?) followed by one byte pad - doesn't seem to matter though */ __u16 MaxReferralLevel; char RequestFileName[1]; } TRANSACTION2_GET_DFS_REFER_REQ; diff -Nru a/fs/dcache.c b/fs/dcache.c --- a/fs/dcache.c Thu Feb 27 01:44:18 2003 +++ b/fs/dcache.c Thu Feb 27 01:44:18 2003 @@ -1004,8 +1004,11 @@ */ if (unlikely(move_count != dentry->d_move_count)) break; - if (!d_unhashed(dentry)) - found = dget(dentry); + if (!d_unhashed(dentry)) { + atomic_inc(&dentry->d_count); + dentry->d_vfs_flags |= DCACHE_REFERENCED; + found = dentry; + } spin_unlock(&dentry->d_lock); break; } diff -Nru a/fs/devfs/base.c b/fs/devfs/base.c --- a/fs/devfs/base.c Thu Feb 27 01:44:19 2003 +++ b/fs/devfs/base.c Thu Feb 27 01:44:19 2003 @@ -1312,7 +1312,7 @@ * free_dentry - Free the dentry for a device entry and invalidate inode. * @de: The entry. * - * This must only be called after the entry has been unhooked from it's + * This must only be called after the entry has been unhooked from its * parent directory. */ @@ -1584,7 +1584,7 @@ /** - * _devfs_unregister - Unregister a device entry from it's parent. + * _devfs_unregister - Unregister a device entry from its parent. * @dir: The parent directory. * @de: The entry to unregister. * @@ -2658,7 +2658,7 @@ else de->u.dir.no_more_additions = TRUE; write_unlock (&de->u.dir.lock); if (err) return err; - /* Now unhook the directory from it's parent */ + /* Now unhook the directory from its parent */ write_lock (&de->parent->u.dir.lock); if ( !_devfs_unhook (de) ) err = -ENOENT; write_unlock (&de->parent->u.dir.lock); diff -Nru a/fs/direct-io.c b/fs/direct-io.c --- a/fs/direct-io.c Thu Feb 27 01:44:24 2003 +++ b/fs/direct-io.c Thu Feb 27 01:44:24 2003 @@ -42,7 +42,7 @@ /* * This code generally works in units of "dio_blocks". A dio_block is * somewhere between the hard sector size and the filesystem block size. it - * is determined on a per-invokation basis. When talking to the filesystem + * is determined on a per-invocation basis. When talking to the filesystem * we need to convert dio_blocks to fs_blocks by scaling the dio_block quantity * down by dio->blkfactor. Similarly, fs-blocksize quantities are converted * to bio_block quantities by shifting left by blkfactor. diff -Nru a/fs/eventpoll.c b/fs/eventpoll.c --- a/fs/eventpoll.c Thu Feb 27 01:44:22 2003 +++ b/fs/eventpoll.c Thu Feb 27 01:44:22 2003 @@ -97,7 +97,7 @@ /* * Remove the item from the list and perform its initialization. - * This is usefull for us because we can test if the item is linked + * This is useful for us because we can test if the item is linked * using "EP_IS_LINKED(p)". */ #define EP_LIST_DEL(p) do { list_del(p); INIT_LIST_HEAD(p); } while (0) @@ -950,7 +950,7 @@ } else { - /* We have to signal that an error occured */ + /* We have to signal that an error occurred */ epi->nwait = -1; } } diff -Nru a/fs/ext2/acl.c b/fs/ext2/acl.c --- a/fs/ext2/acl.c Thu Feb 27 01:44:27 2003 +++ b/fs/ext2/acl.c Thu Feb 27 01:44:27 2003 @@ -419,7 +419,7 @@ */ static size_t ext2_xattr_list_acl_access(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); @@ -432,7 +432,7 @@ static size_t ext2_xattr_list_acl_default(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); @@ -465,7 +465,7 @@ static int ext2_xattr_get_acl_access(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { if (strcmp(name, "") != 0) return -EINVAL; @@ -474,7 +474,7 @@ static int ext2_xattr_get_acl_default(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { if (strcmp(name, "") != 0) return -EINVAL; diff -Nru a/fs/ext2/xattr.c b/fs/ext2/xattr.c --- a/fs/ext2/xattr.c Thu Feb 27 01:44:25 2003 +++ b/fs/ext2/xattr.c Thu Feb 27 01:44:25 2003 @@ -199,7 +199,7 @@ */ ssize_t ext2_getxattr(struct dentry *dentry, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { struct ext2_xattr_handler *handler; struct inode *inode = dentry->d_inode; @@ -207,7 +207,7 @@ handler = ext2_xattr_resolve_name(&name); if (!handler) return -EOPNOTSUPP; - return handler->get(inode, name, buffer, size, flags); + return handler->get(inode, name, buffer, size); } /* @@ -217,9 +217,9 @@ * BKL held [before 2.5.x] */ ssize_t -ext2_listxattr(struct dentry *dentry, char *buffer, size_t size, int flags) +ext2_listxattr(struct dentry *dentry, char *buffer, size_t size) { - return ext2_xattr_list(dentry->d_inode, buffer, size, flags); + return ext2_xattr_list(dentry->d_inode, buffer, size); } /* @@ -250,7 +250,7 @@ * BKL held [before 2.5.x] */ int -ext2_removexattr(struct dentry *dentry, const char *name, int flags) +ext2_removexattr(struct dentry *dentry, const char *name) { struct ext2_xattr_handler *handler; struct inode *inode = dentry->d_inode; @@ -258,7 +258,7 @@ handler = ext2_xattr_resolve_name(&name); if (!handler) return -EOPNOTSUPP; - return handler->set(inode, name, NULL, 0, flags | XATTR_REPLACE); + return handler->set(inode, name, NULL, 0, XATTR_REPLACE); } /* @@ -371,8 +371,7 @@ * used / required on success. */ int -ext2_xattr_list(struct inode *inode, char *buffer, size_t buffer_size, - int flags) +ext2_xattr_list(struct inode *inode, char *buffer, size_t buffer_size) { struct buffer_head *bh = NULL; struct ext2_xattr_entry *entry; @@ -412,7 +411,7 @@ handler = ext2_xattr_handler(entry->e_name_index); if (handler) size += handler->list(NULL, inode, entry->e_name, - entry->e_name_len, flags); + entry->e_name_len); } if (ext2_xattr_cache_insert(bh)) @@ -435,7 +434,7 @@ handler = ext2_xattr_handler(entry->e_name_index); if (handler) buf += handler->list(buf, inode, entry->e_name, - entry->e_name_len, flags); + entry->e_name_len); } error = size; diff -Nru a/fs/ext2/xattr.h b/fs/ext2/xattr.h --- a/fs/ext2/xattr.h Thu Feb 27 01:44:18 2003 +++ b/fs/ext2/xattr.h Thu Feb 27 01:44:18 2003 @@ -58,9 +58,9 @@ struct ext2_xattr_handler { char *prefix; size_t (*list)(char *list, struct inode *inode, const char *name, - int name_len, int flags); + int name_len); int (*get)(struct inode *inode, const char *name, void *buffer, - size_t size, int flags); + size_t size); int (*set)(struct inode *inode, const char *name, const void *buffer, size_t size, int flags); }; @@ -69,12 +69,12 @@ extern void ext2_xattr_unregister(int, struct ext2_xattr_handler *); extern int ext2_setxattr(struct dentry *, const char *, const void *, size_t, int); -extern ssize_t ext2_getxattr(struct dentry *, const char *, void *, size_t, int); -extern ssize_t ext2_listxattr(struct dentry *, char *, size_t, int); -extern int ext2_removexattr(struct dentry *, const char *, int); +extern ssize_t ext2_getxattr(struct dentry *, const char *, void *, size_t); +extern ssize_t ext2_listxattr(struct dentry *, char *, size_t); +extern int ext2_removexattr(struct dentry *, const char *); extern int ext2_xattr_get(struct inode *, int, const char *, void *, size_t); -extern int ext2_xattr_list(struct inode *, char *, size_t, int flags); +extern int ext2_xattr_list(struct inode *, char *, size_t); extern int ext2_xattr_set(struct inode *, int, const char *, const void *, size_t, int); extern void ext2_xattr_delete_inode(struct inode *); diff -Nru a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c --- a/fs/ext2/xattr_trusted.c Thu Feb 27 01:44:18 2003 +++ b/fs/ext2/xattr_trusted.c Thu Feb 27 01:44:18 2003 @@ -16,11 +16,11 @@ static size_t ext2_xattr_trusted_list(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const int prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1; - if (!((flags & XATTR_KERNEL_CONTEXT) || capable(CAP_SYS_ADMIN))) + if (!capable(CAP_SYS_ADMIN)) return 0; if (list) { @@ -33,11 +33,11 @@ static int ext2_xattr_trusted_get(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { if (strcmp(name, "") == 0) return -EINVAL; - if (!((flags & XATTR_KERNEL_CONTEXT) || capable(CAP_SYS_ADMIN))) + if (!capable(CAP_SYS_ADMIN)) return -EPERM; return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name, buffer, size); @@ -49,7 +49,7 @@ { if (strcmp(name, "") == 0) return -EINVAL; - if (!((flags & XATTR_KERNEL_CONTEXT) || capable(CAP_SYS_ADMIN))) + if (!capable(CAP_SYS_ADMIN)) return -EPERM; return ext2_xattr_set(inode, EXT2_XATTR_INDEX_TRUSTED, name, value, size, flags); diff -Nru a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c --- a/fs/ext2/xattr_user.c Thu Feb 27 01:44:25 2003 +++ b/fs/ext2/xattr_user.c Thu Feb 27 01:44:25 2003 @@ -19,12 +19,11 @@ static size_t ext2_xattr_user_list(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const int prefix_len = sizeof(XATTR_USER_PREFIX)-1; - if (!(flags & XATTR_KERNEL_CONTEXT) && - !test_opt(inode->i_sb, XATTR_USER)) + if (!test_opt(inode->i_sb, XATTR_USER)) return 0; if (list) { @@ -37,49 +36,46 @@ static int ext2_xattr_user_get(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { + int error; + if (strcmp(name, "") == 0) return -EINVAL; - if (!(flags & XATTR_KERNEL_CONTEXT)) { - int error; - - if (!test_opt(inode->i_sb, XATTR_USER)) - return -EOPNOTSUPP; + if (!test_opt(inode->i_sb, XATTR_USER)) + return -EOPNOTSUPP; #ifdef CONFIG_EXT2_FS_POSIX_ACL - error = ext2_permission_locked(inode, MAY_READ); + error = ext2_permission_locked(inode, MAY_READ); #else - error = permission(inode, MAY_READ); + error = permission(inode, MAY_READ); #endif - if (error) - return error; - } - return ext2_xattr_get(inode, EXT2_XATTR_INDEX_USER, name, - buffer, size); + if (error) + return error; + + return ext2_xattr_get(inode, EXT2_XATTR_INDEX_USER, name, buffer, size); } static int ext2_xattr_user_set(struct inode *inode, const char *name, const void *value, size_t size, int flags) { + int error; + if (strcmp(name, "") == 0) return -EINVAL; + if (!test_opt(inode->i_sb, XATTR_USER)) + return -EOPNOTSUPP; if ( !S_ISREG(inode->i_mode) && (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX)) return -EPERM; - if (!(flags & XATTR_KERNEL_CONTEXT)) { - int error; - - if (!test_opt(inode->i_sb, XATTR_USER)) - return -EOPNOTSUPP; #ifdef CONFIG_EXT2_FS_POSIX_ACL - error = ext2_permission_locked(inode, MAY_WRITE); + error = ext2_permission_locked(inode, MAY_WRITE); #else - error = permission(inode, MAY_WRITE); + error = permission(inode, MAY_WRITE); #endif - if (error) - return error; - } + if (error) + return error; + return ext2_xattr_set(inode, EXT2_XATTR_INDEX_USER, name, value, size, flags); } diff -Nru a/fs/ext3/acl.c b/fs/ext3/acl.c --- a/fs/ext3/acl.c Thu Feb 27 01:44:21 2003 +++ b/fs/ext3/acl.c Thu Feb 27 01:44:21 2003 @@ -431,7 +431,7 @@ */ static size_t ext3_xattr_list_acl_access(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); @@ -444,7 +444,7 @@ static size_t ext3_xattr_list_acl_default(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); @@ -477,7 +477,7 @@ static int ext3_xattr_get_acl_access(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { if (strcmp(name, "") != 0) return -EINVAL; @@ -486,7 +486,7 @@ static int ext3_xattr_get_acl_default(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { if (strcmp(name, "") != 0) return -EINVAL; diff -Nru a/fs/ext3/dir.c b/fs/ext3/dir.c --- a/fs/ext3/dir.c Thu Feb 27 01:44:23 2003 +++ b/fs/ext3/dir.c Thu Feb 27 01:44:23 2003 @@ -33,12 +33,17 @@ static int ext3_readdir(struct file *, void *, filldir_t); static int ext3_dx_readdir(struct file * filp, void * dirent, filldir_t filldir); +static int ext3_release_dir (struct inode * inode, + struct file * filp); struct file_operations ext3_dir_operations = { .read = generic_read_dir, .readdir = ext3_readdir, /* we take BKL. needed?*/ .ioctl = ext3_ioctl, /* BKL held */ .fsync = ext3_sync_file, /* BKL held */ +#ifdef CONFIG_EXT3_INDEX + .release = ext3_release_dir, +#endif }; @@ -275,7 +280,11 @@ */ parent = n->rb_parent; fname = rb_entry(n, struct fname, rb_hash); - kfree(fname); + while (fname) { + struct fname * old = fname; + fname = fname->next; + kfree (old); + } if (!parent) root->rb_node = 0; else if (parent->rb_left == n) @@ -481,4 +490,13 @@ UPDATE_ATIME(inode); return 0; } + +static int ext3_release_dir (struct inode * inode, struct file * filp) +{ + if (is_dx(inode) && filp->private_data) + ext3_htree_free_dir_info(filp->private_data); + + return 0; +} + #endif diff -Nru a/fs/ext3/file.c b/fs/ext3/file.c --- a/fs/ext3/file.c Thu Feb 27 01:44:30 2003 +++ b/fs/ext3/file.c Thu Feb 27 01:44:30 2003 @@ -55,29 +55,61 @@ return 0; } -/* - * ext3_file_write(). - * - * Most things are done in ext3_prepare_write() and ext3_commit_write(). - */ - static ssize_t ext3_file_write(struct kiocb *iocb, const char *buf, size_t count, loff_t pos) { struct file *file = iocb->ki_filp; struct inode *inode = file->f_dentry->d_inode; + int ret, err; + + ret = generic_file_aio_write(iocb, buf, count, pos); /* - * Nasty: if the file is subject to synchronous writes then we need - * to force generic_osync_inode() to call ext3_write_inode(). - * We do that by marking the inode dirty. This adds much more - * computational expense than we need, but we're going to sync - * anyway. + * Skip flushing if there was an error, or if nothing was written. */ - if (IS_SYNC(inode) || (file->f_flags & O_SYNC)) - mark_inode_dirty(inode); + if (ret <= 0) + return ret; + + /* + * If the inode is IS_SYNC, or is O_SYNC and we are doing data + * journalling then we need to make sure that we force the transaction + * to disk to keep all metadata uptodate synchronously. + */ + if (file->f_flags & O_SYNC) { + /* + * If we are non-data-journaled, then the dirty data has + * already been flushed to backing store by generic_osync_inode, + * and the inode has been flushed too if there have been any + * modifications other than mere timestamp updates. + * + * Open question --- do we care about flushing timestamps too + * if the inode is IS_SYNC? + */ + if (!ext3_should_journal_data(inode)) + return ret; + + goto force_commit; + } - return generic_file_aio_write(iocb, buf, count, pos); + /* + * So we know that there has been no forced data flush. If the inode + * is marked IS_SYNC, we need to force one ourselves. + */ + if (!IS_SYNC(inode)) + return ret; + + /* + * Open question #2 --- should we force data to disk here too? If we + * don't, the only impact is that data=writeback filesystems won't + * flush data to disk automatically on IS_SYNC, only metadata (but + * historically, that is what ext2 has done.) + */ + +force_commit: + err = ext3_force_commit(inode->i_sb); + if (err) + return err; + return ret; } struct file_operations ext3_file_operations = { diff -Nru a/fs/ext3/xattr.c b/fs/ext3/xattr.c --- a/fs/ext3/xattr.c Thu Feb 27 01:44:24 2003 +++ b/fs/ext3/xattr.c Thu Feb 27 01:44:24 2003 @@ -195,7 +195,7 @@ */ ssize_t ext3_getxattr(struct dentry *dentry, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { struct ext3_xattr_handler *handler; struct inode *inode = dentry->d_inode; @@ -203,7 +203,7 @@ handler = ext3_xattr_resolve_name(&name); if (!handler) return -EOPNOTSUPP; - return handler->get(inode, name, buffer, size, flags); + return handler->get(inode, name, buffer, size); } /* @@ -212,9 +212,9 @@ * dentry->d_inode->i_sem down */ ssize_t -ext3_listxattr(struct dentry *dentry, char *buffer, size_t size, int flags) +ext3_listxattr(struct dentry *dentry, char *buffer, size_t size) { - return ext3_xattr_list(dentry->d_inode, buffer, size, flags); + return ext3_xattr_list(dentry->d_inode, buffer, size); } /* @@ -243,7 +243,7 @@ * dentry->d_inode->i_sem down */ int -ext3_removexattr(struct dentry *dentry, const char *name, int flags) +ext3_removexattr(struct dentry *dentry, const char *name) { struct ext3_xattr_handler *handler; struct inode *inode = dentry->d_inode; @@ -251,7 +251,7 @@ handler = ext3_xattr_resolve_name(&name); if (!handler) return -EOPNOTSUPP; - return handler->set(inode, name, NULL, 0, flags | XATTR_REPLACE); + return handler->set(inode, name, NULL, 0, XATTR_REPLACE); } /* @@ -364,8 +364,7 @@ * used / required on success. */ int -ext3_xattr_list(struct inode *inode, char *buffer, size_t buffer_size, - int flags) +ext3_xattr_list(struct inode *inode, char *buffer, size_t buffer_size) { struct buffer_head *bh = NULL; struct ext3_xattr_entry *entry; @@ -405,7 +404,7 @@ handler = ext3_xattr_handler(entry->e_name_index); if (handler) size += handler->list(NULL, inode, entry->e_name, - entry->e_name_len, flags); + entry->e_name_len); } if (ext3_xattr_cache_insert(bh)) @@ -428,7 +427,7 @@ handler = ext3_xattr_handler(entry->e_name_index); if (handler) buf += handler->list(buf, inode, entry->e_name, - entry->e_name_len, flags); + entry->e_name_len); } error = size; diff -Nru a/fs/ext3/xattr.h b/fs/ext3/xattr.h --- a/fs/ext3/xattr.h Thu Feb 27 01:44:30 2003 +++ b/fs/ext3/xattr.h Thu Feb 27 01:44:30 2003 @@ -57,9 +57,9 @@ struct ext3_xattr_handler { char *prefix; size_t (*list)(char *list, struct inode *inode, const char *name, - int name_len, int flags); + int name_len); int (*get)(struct inode *inode, const char *name, void *buffer, - size_t size, int flags); + size_t size); int (*set)(struct inode *inode, const char *name, const void *buffer, size_t size, int flags); }; @@ -68,12 +68,12 @@ extern void ext3_xattr_unregister(int, struct ext3_xattr_handler *); extern int ext3_setxattr(struct dentry *, const char *, const void *, size_t, int); -extern ssize_t ext3_getxattr(struct dentry *, const char *, void *, size_t, int); -extern ssize_t ext3_listxattr(struct dentry *, char *, size_t, int); -extern int ext3_removexattr(struct dentry *, const char *, int); +extern ssize_t ext3_getxattr(struct dentry *, const char *, void *, size_t); +extern ssize_t ext3_listxattr(struct dentry *, char *, size_t); +extern int ext3_removexattr(struct dentry *, const char *); extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t); -extern int ext3_xattr_list(struct inode *, char *, size_t, int flags); +extern int ext3_xattr_list(struct inode *, char *, size_t); extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int); extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int); @@ -97,7 +97,7 @@ } static inline int -ext3_xattr_list(struct inode *inode, void *buffer, size_t size, int flags) +ext3_xattr_list(struct inode *inode, void *buffer, size_t size) { return -EOPNOTSUPP; } diff -Nru a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c --- a/fs/ext3/xattr_trusted.c Thu Feb 27 01:44:26 2003 +++ b/fs/ext3/xattr_trusted.c Thu Feb 27 01:44:26 2003 @@ -17,11 +17,11 @@ static size_t ext3_xattr_trusted_list(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const int prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1; - if (!((flags & XATTR_KERNEL_CONTEXT) || capable(CAP_SYS_ADMIN))) + if (!capable(CAP_SYS_ADMIN)) return 0; if (list) { @@ -34,11 +34,11 @@ static int ext3_xattr_trusted_get(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { if (strcmp(name, "") == 0) return -EINVAL; - if (!((flags & XATTR_KERNEL_CONTEXT) || capable(CAP_SYS_ADMIN))) + if (!capable(CAP_SYS_ADMIN)) return -EPERM; return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name, buffer, size); @@ -50,7 +50,7 @@ { if (strcmp(name, "") == 0) return -EINVAL; - if (!((flags & XATTR_KERNEL_CONTEXT) || capable(CAP_SYS_ADMIN))) + if (!capable(CAP_SYS_ADMIN)) return -EPERM; return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name, value, size, flags); diff -Nru a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c --- a/fs/ext3/xattr_user.c Thu Feb 27 01:44:18 2003 +++ b/fs/ext3/xattr_user.c Thu Feb 27 01:44:18 2003 @@ -21,12 +21,11 @@ static size_t ext3_xattr_user_list(char *list, struct inode *inode, - const char *name, int name_len, int flags) + const char *name, int name_len) { const int prefix_len = sizeof(XATTR_USER_PREFIX)-1; - if (!(flags & XATTR_KERNEL_CONTEXT) && - !test_opt(inode->i_sb, XATTR_USER)) + if (!test_opt(inode->i_sb, XATTR_USER)) return 0; if (list) { @@ -39,49 +38,46 @@ static int ext3_xattr_user_get(struct inode *inode, const char *name, - void *buffer, size_t size, int flags) + void *buffer, size_t size) { + int error; + if (strcmp(name, "") == 0) return -EINVAL; - if (!(flags & XATTR_KERNEL_CONTEXT)) { - int error; - - if (!test_opt(inode->i_sb, XATTR_USER)) - return -EOPNOTSUPP; + if (!test_opt(inode->i_sb, XATTR_USER)) + return -EOPNOTSUPP; #ifdef CONFIG_EXT3_FS_POSIX_ACL - error = ext3_permission_locked(inode, MAY_READ); + error = ext3_permission_locked(inode, MAY_READ); #else - error = permission(inode, MAY_READ); + error = permission(inode, MAY_READ); #endif - if (error) - return error; - } - return ext3_xattr_get(inode, EXT3_XATTR_INDEX_USER, name, - buffer, size); + if (error) + return error; + + return ext3_xattr_get(inode, EXT3_XATTR_INDEX_USER, name, buffer, size); } static int ext3_xattr_user_set(struct inode *inode, const char *name, const void *value, size_t size, int flags) { + int error; + if (strcmp(name, "") == 0) return -EINVAL; + if (!test_opt(inode->i_sb, XATTR_USER)) + return -EOPNOTSUPP; if ( !S_ISREG(inode->i_mode) && (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX)) return -EPERM; - if (!(flags & XATTR_KERNEL_CONTEXT)) { - int error; - - if (!test_opt(inode->i_sb, XATTR_USER)) - return -EOPNOTSUPP; #ifdef CONFIG_EXT3_FS_POSIX_ACL - error = ext3_permission_locked(inode, MAY_WRITE); + error = ext3_permission_locked(inode, MAY_WRITE); #else - error = permission(inode, MAY_WRITE); + error = permission(inode, MAY_WRITE); #endif - if (error) - return error; - } + if (error) + return error; + return ext3_xattr_set(inode, EXT3_XATTR_INDEX_USER, name, value, size, flags); } diff -Nru a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c --- a/fs/hpfs/dnode.c Thu Feb 27 01:44:23 2003 +++ b/fs/hpfs/dnode.c Thu Feb 27 01:44:23 2003 @@ -188,7 +188,7 @@ return de; } -/* Delete dirent and don't care about it's subtree */ +/* Delete dirent and don't care about its subtree */ void hpfs_delete_de(struct super_block *s, struct dnode *d, struct hpfs_dirent *de) { diff -Nru a/fs/inode.c b/fs/inode.c --- a/fs/inode.c Thu Feb 27 01:44:31 2003 +++ b/fs/inode.c Thu Feb 27 01:44:31 2003 @@ -81,6 +81,16 @@ spinlock_t inode_lock = SPIN_LOCK_UNLOCKED; /* + * iprune_sem provides exclusion between the kswapd or try_to_free_pages + * icache shrinking path, and the umount path. Without this exclusion, + * by the time prune_icache calls iput for the inode whose pages it has + * been invalidating, or by the time it calls clear_inode & destroy_inode + * from its final dispose_list, the struct super_block they refer to + * (for inode->i_sb->s_op) may already have been freed and reused. + */ +static DECLARE_MUTEX(iprune_sem); + +/* * Statistics gathering.. */ struct inodes_stat_t inodes_stat; @@ -320,6 +330,7 @@ int busy; LIST_HEAD(throw_away); + down(&iprune_sem); spin_lock(&inode_lock); busy = invalidate_list(&inode_in_use, sb, &throw_away); busy |= invalidate_list(&inode_unused, sb, &throw_away); @@ -328,6 +339,7 @@ spin_unlock(&inode_lock); dispose_list(&throw_away); + up(&iprune_sem); return busy; } @@ -395,6 +407,7 @@ int nr_scanned; unsigned long reap = 0; + down(&iprune_sem); spin_lock(&inode_lock); for (nr_scanned = 0; nr_scanned < nr_to_scan; nr_scanned++) { struct inode *inode; @@ -429,7 +442,10 @@ } inodes_stat.nr_unused -= nr_pruned; spin_unlock(&inode_lock); + dispose_list(&freeable); + up(&iprune_sem); + if (current_is_kswapd) mod_page_state(kswapd_inodesteal, reap); else diff -Nru a/fs/jbd/revoke.c b/fs/jbd/revoke.c --- a/fs/jbd/revoke.c Thu Feb 27 01:44:18 2003 +++ b/fs/jbd/revoke.c Thu Feb 27 01:44:18 2003 @@ -577,7 +577,7 @@ record = find_revoke_record(journal, blocknr); if (record) { - /* If we have multiple occurences, only record the + /* If we have multiple occurrences, only record the * latest sequence number in the hashed record */ if (tid_gt(sequence, record->sequence)) record->sequence = sequence; diff -Nru a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c --- a/fs/jffs2/compr_rtime.c Thu Feb 27 01:44:18 2003 +++ b/fs/jffs2/compr_rtime.c Thu Feb 27 01:44:18 2003 @@ -13,7 +13,7 @@ * Very simple lz77-ish encoder. * * Theory of operation: Both encoder and decoder have a list of "last - * occurances" for every possible source-value; after sending the + * occurrences" for every possible source-value; after sending the * first source-byte, the second byte indicated the "run" length of * matches * diff -Nru a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c --- a/fs/jfs/jfs_dmap.c Thu Feb 27 01:44:28 2003 +++ b/fs/jfs/jfs_dmap.c Thu Feb 27 01:44:28 2003 @@ -1112,7 +1112,7 @@ * current allocation in place if the number of additional blocks * can fit into a dmap, the last block of the current allocation * is not the last block of the file system, and the start of the - * inplace extension is not on an allocation group boundry. + * inplace extension is not on an allocation group boundary. */ if (addnblocks > BPERDMAP || extblkno >= bmp->db_mapsize || (extblkno & (bmp->db_agsize - 1)) == 0) { diff -Nru a/fs/jfs/jfs_xattr.h b/fs/jfs/jfs_xattr.h --- a/fs/jfs/jfs_xattr.h Thu Feb 27 01:44:28 2003 +++ b/fs/jfs/jfs_xattr.h Thu Feb 27 01:44:28 2003 @@ -57,8 +57,8 @@ extern int jfs_setxattr(struct dentry *, const char *, const void *, size_t, int); extern ssize_t __jfs_getxattr(struct inode *, const char *, void *, size_t); -extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t, int); -extern ssize_t jfs_listxattr(struct dentry *, char *, size_t, int); -extern int jfs_removexattr(struct dentry *, const char *, int); +extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t); +extern ssize_t jfs_listxattr(struct dentry *, char *, size_t); +extern int jfs_removexattr(struct dentry *, const char *); #endif /* H_JFS_XATTR */ diff -Nru a/fs/jfs/xattr.c b/fs/jfs/xattr.c --- a/fs/jfs/xattr.c Thu Feb 27 01:44:22 2003 +++ b/fs/jfs/xattr.c Thu Feb 27 01:44:22 2003 @@ -962,13 +962,12 @@ } ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data, - size_t buf_size, int flags) + size_t buf_size) { return __jfs_getxattr(dentry->d_inode, name, data, buf_size); } -ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size, - int flags) +ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size) { struct inode *inode = dentry->d_inode; char *buffer; @@ -1014,7 +1013,7 @@ return size; } -int jfs_removexattr(struct dentry *dentry, const char *name, int flags) +int jfs_removexattr(struct dentry *dentry, const char *name) { return __jfs_setxattr(dentry->d_inode, name, 0, 0, XATTR_REPLACE); } diff -Nru a/fs/mpage.c b/fs/mpage.c --- a/fs/mpage.c Thu Feb 27 01:44:20 2003 +++ b/fs/mpage.c Thu Feb 27 01:44:20 2003 @@ -598,7 +598,7 @@ * If a page is already under I/O, generic_writepages() skips it, even * if it's dirty. This is desirable behaviour for memory-cleaning writeback, * but it is INCORRECT for data-integrity system calls such as fsync(). fsync() - * and msync() need to guarentee that all the data which was dirty at the time + * and msync() need to guarantee that all the data which was dirty at the time * the call was made get new I/O started against them. So if called_for_sync() * is true, we must wait for existing IO to complete. * diff -Nru a/fs/nfsd/export.c b/fs/nfsd/export.c --- a/fs/nfsd/export.c Thu Feb 27 01:44:24 2003 +++ b/fs/nfsd/export.c Thu Feb 27 01:44:24 2003 @@ -626,7 +626,7 @@ exp = exp_get_by_name(clp, nd.mnt, nd.dentry, NULL); - /* must make sure there wont be an ex_fsid clash */ + /* must make sure there won't be an ex_fsid clash */ if ((nxp->ex_flags & NFSEXP_FSID) && (fsid_key = exp_get_fsid_key(clp, nxp->ex_dev)) && !IS_ERR(fsid_key) && diff -Nru a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c --- a/fs/nfsd/nfs4xdr.c Thu Feb 27 01:44:27 2003 +++ b/fs/nfsd/nfs4xdr.c Thu Feb 27 01:44:27 2003 @@ -1770,7 +1770,7 @@ * XXX: By default, the ->readlink() VFS op will truncate symlinks * if they would overflow the buffer. Is this kosher in NFSv4? If * not, one easy fix is: if ->readlink() precisely fills the buffer, - * assume that truncation occured, and return NFS4ERR_RESOURCE. + * assume that truncation occurred, and return NFS4ERR_RESOURCE. */ nfserr = nfsd_readlink(readlink->rl_rqstp, readlink->rl_fhp, page, &maxcount); if (nfserr) diff -Nru a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c --- a/fs/nfsd/nfsctl.c Thu Feb 27 01:44:19 2003 +++ b/fs/nfsd/nfsctl.c Thu Feb 27 01:44:19 2003 @@ -77,7 +77,7 @@ }; /* an argresp is stored in an allocated page and holds the - * size of the argument or response, along with it's content + * size of the argument or response, along with its content */ struct argresp { ssize_t size; diff -Nru a/fs/ntfs/aops.c b/fs/ntfs/aops.c --- a/fs/ntfs/aops.c Thu Feb 27 01:44:27 2003 +++ b/fs/ntfs/aops.c Thu Feb 27 01:44:27 2003 @@ -942,7 +942,7 @@ * the below memcpy() already takes care of the mmap-at-end-of-file * requirements. If the file is converted to a non-resident one, then * the code path use is switched to the non-resident one where the - * zeroing happens on each ntfs_writepage() invokation. + * zeroing happens on each ntfs_writepage() invocation. * * The above also applies nicely when i_size is decreased. * @@ -1087,7 +1087,7 @@ if (block >= ablock) { // TODO: block is above allocated_size, need to - // allocate it. Best done in one go to accomodate not + // allocate it. Best done in one go to accommodate not // only block but all above blocks up to and including: // ((page->index << PAGE_CACHE_SHIFT) + to + blocksize // - 1) >> blobksize_bits. Obviously will need to round diff -Nru a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c --- a/fs/ntfs/attrib.c Thu Feb 27 01:44:31 2003 +++ b/fs/ntfs/attrib.c Thu Feb 27 01:44:31 2003 @@ -830,7 +830,7 @@ goto io_error; for (deltaxcn = (s8)buf[b--]; b > b2; b--) deltaxcn = (deltaxcn << 8) + buf[b]; - /* Change the current lcn to it's new value. */ + /* Change the current lcn to its new value. */ lcn += deltaxcn; #ifdef DEBUG /* diff -Nru a/fs/ntfs/layout.h b/fs/ntfs/layout.h --- a/fs/ntfs/layout.h Thu Feb 27 01:44:23 2003 +++ b/fs/ntfs/layout.h Thu Feb 27 01:44:23 2003 @@ -152,7 +152,7 @@ * been written to disk. The values 0 and -1 (ie. 0xffff) are not used. All * last u16's of each sector have to be equal to the usn (during reading) or * are set to it (during writing). If they are not, an incomplete multi sector - * transfer has occured when the data was written. + * transfer has occurred when the data was written. * The maximum size for the update sequence array is fixed to: * maximum size = usa_ofs + (usa_count * 2) = 510 bytes * The 510 bytes comes from the fact that the last u16 in the array has to diff -Nru a/fs/ntfs/mft.c b/fs/ntfs/mft.c --- a/fs/ntfs/mft.c Thu Feb 27 01:44:26 2003 +++ b/fs/ntfs/mft.c Thu Feb 27 01:44:26 2003 @@ -202,7 +202,7 @@ * records/inodes present in the page before I/O can proceed. In that case we * wouldn't need to bother with PG_locked and PG_uptodate as nobody will be * accessing anything without owning the mrec_lock semaphore. But we do need - * to use them because of the read_cache_page() invokation and the code becomes + * to use them because of the read_cache_page() invocation and the code becomes * so much simpler this way that it is well worth it. * * The mft record is now ours and we return a pointer to it. You need to check diff -Nru a/fs/ntfs/namei.c b/fs/ntfs/namei.c --- a/fs/ntfs/namei.c Thu Feb 27 01:44:27 2003 +++ b/fs/ntfs/namei.c Thu Feb 27 01:44:27 2003 @@ -233,7 +233,7 @@ m = NULL; ctx = NULL; - /* Check if a conversion error occured. */ + /* Check if a conversion error occurred. */ if ((signed)nls_name.len < 0) { err = (signed)nls_name.len; goto err_out; diff -Nru a/fs/proc/array.c b/fs/proc/array.c --- a/fs/proc/array.c Thu Feb 27 01:44:25 2003 +++ b/fs/proc/array.c Thu Feb 27 01:44:25 2003 @@ -358,7 +358,8 @@ nice, 0UL /* removed */, jiffies_to_clock_t(task->it_real_value), - (unsigned long long) jiffies_64_to_clock_t(task->start_time), + (unsigned long long) + jiffies_64_to_clock_t(task->start_time - INITIAL_JIFFIES), vsize, mm ? mm->rss : 0, /* you might want to shift this left 3 */ task->rlim[RLIMIT_RSS].rlim_cur, diff -Nru a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c --- a/fs/proc/proc_misc.c Thu Feb 27 01:44:18 2003 +++ b/fs/proc/proc_misc.c Thu Feb 27 01:44:18 2003 @@ -104,7 +104,7 @@ unsigned long uptime_remainder; int len; - uptime = get_jiffies_64(); + uptime = get_jiffies_64() - INITIAL_JIFFIES; uptime_remainder = (unsigned long) do_div(uptime, HZ); #if HZ!=100 @@ -320,7 +320,7 @@ { int i, len; extern unsigned long total_forks; - u64 jif = get_jiffies_64(); + u64 jif = get_jiffies_64() - INITIAL_JIFFIES; unsigned int sum = 0, user = 0, nice = 0, system = 0, idle = 0, iowait = 0; for (i = 0 ; i < NR_CPUS; i++) { diff -Nru a/fs/quota_v2.c b/fs/quota_v2.c --- a/fs/quota_v2.c Thu Feb 27 01:44:27 2003 +++ b/fs/quota_v2.c Thu Feb 27 01:44:27 2003 @@ -415,7 +415,7 @@ if (!dquot->dq_off) if ((ret = dq_insert_tree(dquot)) < 0) { - printk(KERN_ERR "VFS: Error %Zd occured while creating quota.\n", ret); + printk(KERN_ERR "VFS: Error %Zd occurred while creating quota.\n", ret); return ret; } filp = sb_dqopt(dquot->dq_sb)->files[type]; diff -Nru a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c --- a/fs/reiserfs/do_balan.c Thu Feb 27 01:44:19 2003 +++ b/fs/reiserfs/do_balan.c Thu Feb 27 01:44:19 2003 @@ -1381,7 +1381,7 @@ if ( cur_tb ) { reiserfs_panic (tb->tb_sb, "vs-12335: check_before_balancing: " "suspect that schedule occurred based on cur_tb not being null at this point in code. " - "do_balance cannot properly handle schedule occuring while it runs."); + "do_balance cannot properly handle schedule occurring while it runs."); } /* double check that buffers that we will modify are unlocked. (fix_nodes should already have diff -Nru a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c --- a/fs/reiserfs/journal.c Thu Feb 27 01:44:25 2003 +++ b/fs/reiserfs/journal.c Thu Feb 27 01:44:25 2003 @@ -1629,7 +1629,7 @@ /* ** read and replay the log ** on a clean unmount, the journal header's next unflushed pointer will be to an invalid -** transaction. This tests that before finding all the transactions in the log, whic makes normal mount times fast. +** transaction. This tests that before finding all the transactions in the log, which makes normal mount times fast. ** ** After a crash, this starts with the next unflushed transaction, and replays until it finds one too old, or invalid. ** @@ -1913,7 +1913,7 @@ result = -ENOMEM; if( result != 0 ) printk( "sh-458: journal_init_dev: cannot init journal device\n '%s': %i", - kdevname( to_kdev_t(jdev) ), result ); + bdevname(journal->j_dev_bd), result ); else if (jdev != super->s_dev) { set_blocksize(journal->j_dev_bd, super->s_blocksize); @@ -1931,7 +1931,7 @@ printk( "journal_init_dev: '%s' is not a block device", jdev_name ); result = -ENOTBLK; } else if( jdev_inode -> i_bdev == NULL ) { - printk( "journal_init_dev: bdev unintialized for '%s'", jdev_name ); + printk( "journal_init_dev: bdev uninitialized for '%s'", jdev_name ); result = -ENOMEM; } else { /* ok */ @@ -1946,7 +1946,7 @@ if( result != 0 ) { release_journal_dev( super, journal ); } - printk( "journal_init_dev: journal device: %s", kdevname(to_kdev_t(jdev)) ); + printk( "journal_init_dev: journal device: %s", bdevname(journal->j_dev_bd)); return result; } @@ -2523,7 +2523,7 @@ ** haven't hit disk yet. called from bitmap.c ** ** if it starts flushing things, it ors SCHEDULE_OCCURRED into repeat. -** note, this is just if schedule has a chance of occuring. I need to +** note, this is just if schedule has a chance of occurring. I need to ** change flush_commit_lists to have a repeat parameter too. ** */ diff -Nru a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c --- a/fs/reiserfs/lbalance.c Thu Feb 27 01:44:31 2003 +++ b/fs/reiserfs/lbalance.c Thu Feb 27 01:44:31 2003 @@ -1192,7 +1192,7 @@ } - /* change item key if neccessary (when we paste before 0-th entry */ + /* change item key if necessary (when we paste before 0-th entry */ if (!before) { set_le_ih_k_offset (ih, deh_offset(new_dehs)); diff -Nru a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c --- a/fs/reiserfs/stree.c Thu Feb 27 01:44:26 2003 +++ b/fs/reiserfs/stree.c Thu Feb 27 01:44:26 2003 @@ -1495,7 +1495,7 @@ /* Repeat this loop until we either cut the item without needing - to balance, or we fix_nodes without schedule occuring */ + to balance, or we fix_nodes without schedule occurring */ while ( 1 ) { /* Determine the balance mode, position of the first byte to be cut, and size to be cut. In case of the indirect item diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c --- a/fs/reiserfs/super.c Thu Feb 27 01:44:22 2003 +++ b/fs/reiserfs/super.c Thu Feb 27 01:44:22 2003 @@ -1356,7 +1356,7 @@ buf->f_bavail = buf->f_bfree; buf->f_blocks = sb_block_count(rs) - sb_bmap_nr(rs) - 1; buf->f_bsize = s->s_blocksize; - /* changed to accomodate gcc folks.*/ + /* changed to accommodate gcc folks.*/ buf->f_type = REISERFS_SUPER_MAGIC; return 0; } diff -Nru a/fs/seq_file.c b/fs/seq_file.c --- a/fs/seq_file.c Thu Feb 27 01:44:26 2003 +++ b/fs/seq_file.c Thu Feb 27 01:44:26 2003 @@ -250,7 +250,7 @@ * @s: string * @esc: set of characters that need escaping * - * Puts string into buffer, replacing each occurence of character from + * Puts string into buffer, replacing each occurrence of character from * @esc with usual octal escape. Returns 0 in case of success, -1 - in * case of overflow. */ diff -Nru a/fs/udf/dir.c b/fs/udf/dir.c --- a/fs/udf/dir.c Thu Feb 27 01:44:21 2003 +++ b/fs/udf/dir.c Thu Feb 27 01:44:21 2003 @@ -19,7 +19,7 @@ * * HISTORY * - * 10/05/98 dgb Split directory operations into it's own file + * 10/05/98 dgb Split directory operations into its own file * Implemented directory reads via do_udf_readdir * 10/06/98 Made directory operations work! * 11/17/98 Rewrote directory to support ICBTAG_FLAG_AD_LONG diff -Nru a/fs/xattr.c b/fs/xattr.c --- a/fs/xattr.c Thu Feb 27 01:44:22 2003 +++ b/fs/xattr.c Thu Feb 27 01:44:22 2003 @@ -160,7 +160,7 @@ if (error) goto out; down(&d->d_inode->i_sem); - error = d->d_inode->i_op->getxattr(d, kname, kvalue, size, 0); + error = d->d_inode->i_op->getxattr(d, kname, kvalue, size); up(&d->d_inode->i_sem); } @@ -233,7 +233,7 @@ if (error) goto out; down(&d->d_inode->i_sem); - error = d->d_inode->i_op->listxattr(d, klist, size, 0); + error = d->d_inode->i_op->listxattr(d, klist, size); up(&d->d_inode->i_sem); } @@ -308,7 +308,7 @@ if (error) goto out; down(&d->d_inode->i_sem); - error = d->d_inode->i_op->removexattr(d, kname, 0); + error = d->d_inode->i_op->removexattr(d, kname); up(&d->d_inode->i_sem); } out: diff -Nru a/fs/xfs/linux/xfs_globals.c b/fs/xfs/linux/xfs_globals.c --- a/fs/xfs/linux/xfs_globals.c Thu Feb 27 01:44:25 2003 +++ b/fs/xfs/linux/xfs_globals.c Thu Feb 27 01:44:25 2003 @@ -37,7 +37,16 @@ #include +/* + * System memory size - used to scale certain data structures in XFS. + */ unsigned long xfs_physmem; + +/* + * Tunable XFS parameters. xfs_params is required even when CONFIG_SYSCTL=n, + * other XFS code uses these values. + */ +xfs_param_t xfs_params = { 0, 1, 0, 0, 0 }; /* * Used to serialize atomicIncWithWrap. diff -Nru a/fs/xfs/linux/xfs_iops.c b/fs/xfs/linux/xfs_iops.c --- a/fs/xfs/linux/xfs_iops.c Thu Feb 27 01:44:21 2003 +++ b/fs/xfs/linux/xfs_iops.c Thu Feb 27 01:44:21 2003 @@ -523,7 +523,7 @@ */ #define SYSTEM_NAME "system." /* VFS shared names/values */ -#define ROOT_NAME "xfsroot." /* XFS ondisk names/values */ +#define ROOT_NAME "trusted." /* root's own names/values */ #define USER_NAME "user." /* user's own names/values */ STATIC xattr_namespace_t xfs_namespace_array[] = { { .name= SYSTEM_NAME, .namelen= sizeof(SYSTEM_NAME)-1,.exists= NULL }, @@ -590,7 +590,7 @@ error = -EINVAL; if (flags & XATTR_CREATE) return error; - error = -ENOATTR; + error = -EOPNOTSUPP; p += xfs_namespaces[SYSTEM_NAMES].namelen; if (strcmp(p, POSIXACL_ACCESS) == 0) { error = xfs_acl_vset(vp, (void *) data, size, @@ -632,7 +632,7 @@ VOP_ATTR_SET(vp, p, (void *) data, size, xflags, NULL, error); return -error; } - return -ENOATTR; + return -EOPNOTSUPP; } STATIC ssize_t @@ -640,8 +640,7 @@ struct dentry *dentry, const char *name, void *data, - size_t size, - int flags) + size_t size) { ssize_t error; int xflags = 0; @@ -651,7 +650,7 @@ if (strncmp(name, xfs_namespaces[SYSTEM_NAMES].name, xfs_namespaces[SYSTEM_NAMES].namelen) == 0) { - error = -ENOATTR; + error = -EOPNOTSUPP; p += xfs_namespaces[SYSTEM_NAMES].namelen; if (strcmp(p, POSIXACL_ACCESS) == 0) { error = xfs_acl_vget(vp, data, size, _ACL_TYPE_ACCESS); @@ -690,7 +689,7 @@ error = -size; return -error; } - return -ENOATTR; + return -EOPNOTSUPP; } @@ -698,8 +697,7 @@ linvfs_listxattr( struct dentry *dentry, char *data, - size_t size, - int flags) + size_t size) { ssize_t error; int result = 0; @@ -743,8 +741,7 @@ STATIC int linvfs_removexattr( struct dentry *dentry, - const char *name, - int flags) + const char *name) { int error; int xflags = 0; @@ -754,7 +751,7 @@ if (strncmp(name, xfs_namespaces[SYSTEM_NAMES].name, xfs_namespaces[SYSTEM_NAMES].namelen) == 0) { - error = -ENOATTR; + error = -EOPNOTSUPP; p += xfs_namespaces[SYSTEM_NAMES].namelen; if (strcmp(p, POSIXACL_ACCESS) == 0) error = xfs_acl_vremove(vp, _ACL_TYPE_ACCESS); @@ -782,7 +779,7 @@ VOP_ATTR_REMOVE(vp, p, xflags, NULL, error); return -error; } - return -ENOATTR; + return -EOPNOTSUPP; } diff -Nru a/fs/xfs/linux/xfs_sysctl.c b/fs/xfs/linux/xfs_sysctl.c --- a/fs/xfs/linux/xfs_sysctl.c Thu Feb 27 01:44:31 2003 +++ b/fs/xfs/linux/xfs_sysctl.c Thu Feb 27 01:44:31 2003 @@ -34,16 +34,9 @@ #include #include -/* - * Tunable XFS parameters - */ - -extern struct xfsstats xfsstats; STATIC ulong xfs_min[XFS_PARAM] = { 0, 0, 0, 0, 0 }; STATIC ulong xfs_max[XFS_PARAM] = { 1, 1, 1, 1, 127 }; - -xfs_param_t xfs_params = { 0, 1, 0, 0, 0 }; static struct ctl_table_header *xfs_table_header; diff -Nru a/fs/xfs/linux/xfs_sysctl.h b/fs/xfs/linux/xfs_sysctl.h --- a/fs/xfs/linux/xfs_sysctl.h Thu Feb 27 01:44:16 2003 +++ b/fs/xfs/linux/xfs_sysctl.h Thu Feb 27 01:44:16 2003 @@ -64,8 +64,8 @@ extern void xfs_sysctl_register(void); extern void xfs_sysctl_unregister(void); #else -static __inline void xfs_sysctl_register(void) { }; -static __inline void xfs_sysctl_unregister(void) { }; -#endif +# define xfs_sysctl_register() do { } while (0) +# define xfs_sysctl_unregister() do { } while (0) +#endif /* CONFIG_SYSCTL */ #endif /* __XFS_SYSCTL_H__ */ diff -Nru a/fs/xfs/pagebuf/page_buf.c b/fs/xfs/pagebuf/page_buf.c --- a/fs/xfs/pagebuf/page_buf.c Thu Feb 27 01:44:17 2003 +++ b/fs/xfs/pagebuf/page_buf.c Thu Feb 27 01:44:17 2003 @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -155,37 +156,35 @@ * Pagebuf hashing */ -/* This structure must be a power of 2 long for the hash to work */ +#define NBITS 8 +#define NHASH (1<pb_hash_index] -/* - * This hash is the same one as used on the Linux buffer cache, - * see fs/buffer.c - */ - -#define _hashfn(dev,block) \ - ((((dev)<<(pb_hash_shift - 6)) ^ ((dev)<<(pb_hash_shift - 9))) ^ \ - (((block)<<(pb_hash_shift - 6)) ^ ((block) >> 13) ^ \ - ((block) << (pb_hash_shift - 12)))) - -static inline int +STATIC int _bhash( dev_t dev, loff_t base) { + int bit, hval; + base >>= 9; - - return (_hashfn(dev, base) & pb_hash_mask); + /* + * dev_t is 16 bits, loff_t is always 64 bits + */ + base ^= dev; + for (bit = hval = 0; base != 0 && bit < sizeof(base) * 8; bit += NBITS) { + hval ^= (int)base & (NHASH-1); + base >>= NBITS; + } + return hval; } /* @@ -703,8 +702,7 @@ * are in memory. The buffer may have unallocated holes, if * some, but not all, of the blocks are in memory. Even where * pages are present in the buffer, not all of every page may be - * valid. The file system may use pagebuf_segment to visit the - * various segments of the buffer. + * valid. */ page_buf_t * pagebuf_find( /* find buffer for block */ @@ -721,11 +719,10 @@ * pagebuf_get * * pagebuf_get assembles a buffer covering the specified range. - * Some or all of the blocks in the range may be valid. The file - * system may use pagebuf_segment to visit the various segments - * of the buffer. Storage in memory for all portions of the - * buffer will be allocated, although backing storage may not be. - * If PBF_READ is set in flags, pagebuf_read + * Some or all of the blocks in the range may be valid. Storage + * in memory for all portions of the buffer will be allocated, + * although backing storage may not be. If PBF_READ is set in + * flags, pagebuf_iostart is called also. */ page_buf_t * pagebuf_get( /* allocate a buffer */ @@ -1200,8 +1197,10 @@ return status; } - pb->pb_flags &= ~(PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_DELWRI|PBF_READ_AHEAD); - pb->pb_flags |= flags & (PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_SYNC|PBF_READ_AHEAD); + pb->pb_flags &= + ~(PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_DELWRI|PBF_READ_AHEAD); + pb->pb_flags |= flags & + (PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_SYNC|PBF_READ_AHEAD); BUG_ON(pb->pb_bn == PAGE_BUF_DADDR_NULL); @@ -1298,7 +1297,6 @@ pagebuf_iorequest( /* start real I/O */ page_buf_t *pb) /* buffer to convey to device */ { - int status = 0; int i, map_i, total_nr_pages, nr_pages; struct bio *bio; int offset = pb->pb_offset; @@ -1313,7 +1311,7 @@ if (pb->pb_flags & PBF_DELWRI) { pagebuf_delwri_queue(pb, 1); - return status; + return 0; } /* Set the count to 1 initially, this will stop an I/O @@ -1413,10 +1411,11 @@ io_submitted: if (atomic_dec_and_test(&pb->pb_io_remaining) == 1) { + pb->pb_locked = 0; pagebuf_iodone(pb, 0); } - return status < 0 ? status : 0; + return 0; } /* @@ -1459,7 +1458,7 @@ caddr_t pagebuf_offset( page_buf_t *pb, - off_t offset) + size_t offset) { struct page *page; @@ -1586,6 +1585,10 @@ INIT_LIST_HEAD(&tmp); do { + /* swsusp */ + if (current->flags & PF_FREEZE) + refrigerator(PF_IOTHREAD); + if (pbd_active == 1) { del_timer(&pb_daemon_timer); pb_daemon_timer.expires = jiffies + @@ -1864,39 +1867,7 @@ int __init pagebuf_init(void) { - int order, mempages, i; - unsigned int nr_hash; - extern int xfs_physmem; - - mempages = xfs_physmem >>= 16; - mempages *= sizeof(pb_hash_t); - for (order = 0; (1 << order) < mempages; order++) - ; - - if (order > 3) order = 3; /* cap us at 2K buckets */ - - do { - unsigned long tmp; - - nr_hash = (PAGE_SIZE << order) / sizeof(pb_hash_t); - nr_hash = 1 << (ffs(nr_hash) - 1); - pb_hash_mask = (nr_hash - 1); - tmp = nr_hash; - pb_hash_shift = 0; - while((tmp >>= 1UL) != 0UL) - pb_hash_shift++; - - pbhash = (pb_hash_t *) - __get_free_pages(GFP_KERNEL, order); - pb_order = order; - } while (pbhash == NULL && --order > 0); - printk("pagebuf cache hash table entries: %d (order: %d, %ld bytes)\n", - nr_hash, order, (PAGE_SIZE << order)); - - for(i = 0; i < nr_hash; i++) { - spin_lock_init(&pbhash[i].pb_hash_lock); - INIT_LIST_HEAD(&pbhash[i].pb_hash); - } + int i; pagebuf_table_header = register_sysctl_table(pagebuf_root_table, 1); @@ -1914,6 +1885,11 @@ return -ENOMEM; } + for (i = 0; i < NHASH; i++) { + spin_lock_init(&pbhash[i].pb_hash_lock); + INIT_LIST_HEAD(&pbhash[i].pb_hash); + } + #ifdef PAGEBUF_TRACE pb_trace.buf = (pagebuf_trace_t *)kmalloc( PB_TRACE_BUFSIZE * sizeof(pagebuf_trace_t), GFP_KERNEL); @@ -1940,7 +1916,6 @@ kmem_cache_destroy(pagebuf_cache); kmem_shake_deregister(pagebuf_shaker); - free_pages((unsigned long)pbhash, pb_order); unregister_sysctl_table(pagebuf_table_header); #ifdef CONFIG_PROC_FS diff -Nru a/fs/xfs/pagebuf/page_buf.h b/fs/xfs/pagebuf/page_buf.h --- a/fs/xfs/pagebuf/page_buf.h Thu Feb 27 01:44:24 2003 +++ b/fs/xfs/pagebuf/page_buf.h Thu Feb 27 01:44:24 2003 @@ -215,8 +215,8 @@ unsigned short pb_error; /* error code on I/O */ unsigned short pb_page_count; /* size of page array */ unsigned short pb_offset; /* page offset in first page */ - unsigned short pb_hash_index; /* hash table index */ unsigned char pb_locked; /* page array is locked */ + unsigned char pb_hash_index; /* hash table index */ struct page **pb_pages; /* array of page pointers */ struct page *pb_page_array[PB_PAGES]; /* inline pages */ #ifdef PAGEBUF_LOCK_TRACKING @@ -329,7 +329,7 @@ extern int pagebuf_iowait( /* wait for buffer I/O done */ page_buf_t *); /* buffer to wait on */ -extern caddr_t pagebuf_offset(page_buf_t *, off_t); +extern caddr_t pagebuf_offset(page_buf_t *, size_t); extern void pagebuf_iomove( /* move data in/out of pagebuf */ page_buf_t *, /* buffer to manipulate */ diff -Nru a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c --- a/fs/xfs/support/debug.c Thu Feb 27 01:44:18 2003 +++ b/fs/xfs/support/debug.c Thu Feb 27 01:44:18 2003 @@ -85,8 +85,8 @@ cmn_err(register int level, char *fmt, ...) { char *fp = fmt; + ulong flags; int len; - unsigned long flags; va_list ap; level &= XFS_ERR_MASK; @@ -110,8 +110,8 @@ void icmn_err(register int level, char *fmt, va_list ap) { + ulong flags; int len; - int flags; level &= XFS_ERR_MASK; if(level > XFS_MAX_ERR_LEVEL) diff -Nru a/fs/xfs/xfs_attr.h b/fs/xfs/xfs_attr.h --- a/fs/xfs/xfs_attr.h Thu Feb 27 01:44:20 2003 +++ b/fs/xfs/xfs_attr.h Thu Feb 27 01:44:20 2003 @@ -69,7 +69,7 @@ /* * The maximum size (into the kernel or returned from the kernel) of an * attribute value or the buffer used for an attr_list() call. Larger - * sizes will result in an E2BIG return code. + * sizes will result in an ERANGE return code. */ #define ATTR_MAX_VALUELEN (64*1024) /* max length of a value */ diff -Nru a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c --- a/fs/xfs/xfs_attr_leaf.c Thu Feb 27 01:44:23 2003 +++ b/fs/xfs/xfs_attr_leaf.c Thu Feb 27 01:44:23 2003 @@ -1374,7 +1374,7 @@ count * sizeof(xfs_attr_leaf_entry_t) + INT_GET(leaf->hdr.usedbytes, ARCH_CONVERT); if (bytes > (state->blocksize >> 1)) { - *action = 0; /* blk over 50%, dont try to join */ + *action = 0; /* blk over 50%, don't try to join */ return(0); } diff -Nru a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h --- a/fs/xfs/xfs_buf.h Thu Feb 27 01:44:30 2003 +++ b/fs/xfs/xfs_buf.h Thu Feb 27 01:44:30 2003 @@ -153,7 +153,7 @@ #define XFS_BUF_PTR(bp) (xfs_caddr_t)((bp)->pb_addr) -extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, off_t offset) +extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, size_t offset) { if (bp->pb_flags & PBF_MAPPED) return XFS_BUF_PTR(bp) + offset; diff -Nru a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c --- a/fs/xfs/xfs_buf_item.c Thu Feb 27 01:44:17 2003 +++ b/fs/xfs/xfs_buf_item.c Thu Feb 27 01:44:17 2003 @@ -924,7 +924,7 @@ /* - * Add the given log item with it's callback to the list of callbacks + * Add the given log item with its callback to the list of callbacks * to be called when the buffer's I/O completes. If it is not set * already, set the buffer's b_iodone() routine to be * xfs_buf_iodone_callbacks() and link the log item into the list of diff -Nru a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c --- a/fs/xfs/xfs_da_btree.c Thu Feb 27 01:44:27 2003 +++ b/fs/xfs/xfs_da_btree.c Thu Feb 27 01:44:27 2003 @@ -830,8 +830,8 @@ node = (xfs_da_intnode_t *)info; count = INT_GET(node->hdr.count, ARCH_CONVERT); if (count > (state->node_ents >> 1)) { - *action = 0; /* blk over 50%, dont try to join */ - return(0); /* blk over 50%, dont try to join */ + *action = 0; /* blk over 50%, don't try to join */ + return(0); /* blk over 50%, don't try to join */ } /* diff -Nru a/fs/xfs/xfs_dir_leaf.c b/fs/xfs/xfs_dir_leaf.c --- a/fs/xfs/xfs_dir_leaf.c Thu Feb 27 01:44:28 2003 +++ b/fs/xfs/xfs_dir_leaf.c Thu Feb 27 01:44:28 2003 @@ -1341,7 +1341,7 @@ count * ((uint)sizeof(xfs_dir_leaf_name_t)-1) + INT_GET(leaf->hdr.namebytes, ARCH_CONVERT); if (bytes > (state->blocksize >> 1)) { - *action = 0; /* blk over 50%, dont try to join */ + *action = 0; /* blk over 50%, don't try to join */ return(0); } diff -Nru a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c --- a/fs/xfs/xfs_dquot.c Thu Feb 27 01:44:22 2003 +++ b/fs/xfs/xfs_dquot.c Thu Feb 27 01:44:22 2003 @@ -840,7 +840,7 @@ * Given the file system, inode OR id, and type (UDQUOT/GDQUOT), return a * a locked dquot, doing an allocation (if requested) as needed. * When both an inode and an id are given, the inode's id takes precedence. - * That is, if the id changes while we dont hold the ilock inside this + * That is, if the id changes while we don't hold the ilock inside this * function, the new dquot is returned, not necessarily the one requested * in the id argument. */ @@ -1449,7 +1449,7 @@ xfs_dqtrace_entry(dqp, "DQPURGE ->DQFLUSH: DQDIRTY"); /* dqflush unlocks dqflock */ /* - * Given that dqpurge is a very rare occurence, it is OK + * Given that dqpurge is a very rare occurrence, it is OK * that we're holding the hashlist and mplist locks * across the disk write. But, ... XXXsup * diff -Nru a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c --- a/fs/xfs/xfs_inode.c Thu Feb 27 01:44:30 2003 +++ b/fs/xfs/xfs_inode.c Thu Feb 27 01:44:30 2003 @@ -1001,7 +1001,7 @@ } /* - * Allocate an inode on disk and return a copy of it's in-core version. + * Allocate an inode on disk and return a copy of its in-core version. * The in-core inode is locked exclusively. Set mode, nlink, and rdev * appropriately within the inode. The uid and gid for the inode are * set according to the contents of the given cred structure. diff -Nru a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h --- a/fs/xfs/xfs_log.h Thu Feb 27 01:44:31 2003 +++ b/fs/xfs/xfs_log.h Thu Feb 27 01:44:31 2003 @@ -53,10 +53,10 @@ * endian issues in treating two 32 bit numbers as one 64 bit number */ static -#ifdef __GNUC__ -# if !((__GNUC__ == 2) && (__GNUC_MINOR__ == 95)) +#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95) +__attribute__((unused)) /* gcc 2.95 miscompiles this when inlined */ +#else __inline__ -#endif #endif xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2, xfs_arch_t arch) { diff -Nru a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c --- a/fs/xfs/xfs_mount.c Thu Feb 27 01:44:22 2003 +++ b/fs/xfs/xfs_mount.c Thu Feb 27 01:44:22 2003 @@ -1023,7 +1023,7 @@ /* * If the xfs quota code isn't installed, * we have to reset the quotachk'd bit. - * If an error occured, qm_mount_quotas code + * If an error occurred, qm_mount_quotas code * has already disabled quotas. So, just finish * mounting, and get on with the boring life * without disk quotas. diff -Nru a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c --- a/fs/xfs/xfs_trans_dquot.c Thu Feb 27 01:44:19 2003 +++ b/fs/xfs/xfs_trans_dquot.c Thu Feb 27 01:44:19 2003 @@ -755,7 +755,7 @@ /* * Lock the dquot and change the reservation if we can. - * This doesnt change the actual usage, just the reservation. + * This doesn't change the actual usage, just the reservation. * The inode sent in is locked. * * Returns 0 on success, EDQUOT or other errors otherwise diff -Nru a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h --- a/include/asm-alpha/mman.h Thu Feb 27 01:44:17 2003 +++ b/include/asm-alpha/mman.h Thu Feb 27 01:44:17 2003 @@ -39,7 +39,7 @@ #define MADV_SEQUENTIAL 2 /* expect sequential page references */ #define MADV_WILLNEED 3 /* will need these pages */ #define MADV_SPACEAVAIL 5 /* ensure resources are available */ -#define MADV_DONTNEED 6 /* dont need these pages */ +#define MADV_DONTNEED 6 /* don't need these pages */ /* compatibility flags */ #define MAP_ANON MAP_ANONYMOUS diff -Nru a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h --- a/include/asm-alpha/pci.h Thu Feb 27 01:44:16 2003 +++ b/include/asm-alpha/pci.h Thu Feb 27 01:44:16 2003 @@ -97,7 +97,7 @@ /* Unmap a single streaming mode DMA translation. The DMA_ADDR and SIZE must match what was provided for in a previous pci_map_single call. All other usages are undefined. After this call, reads by - the cpu to the buffer are guarenteed to see whatever the device + the cpu to the buffer are guaranteed to see whatever the device wrote there. */ extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int); diff -Nru a/include/asm-alpha/rwsem.h b/include/asm-alpha/rwsem.h --- a/include/asm-alpha/rwsem.h Thu Feb 27 01:44:28 2003 +++ b/include/asm-alpha/rwsem.h Thu Feb 27 01:44:28 2003 @@ -7,7 +7,7 @@ */ #ifndef _LINUX_RWSEM_H -#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead +#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #endif #ifdef __KERNEL__ diff -Nru a/include/asm-arm/arch-sa1100/simpad.h b/include/asm-arm/arch-sa1100/simpad.h --- a/include/asm-arm/arch-sa1100/simpad.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-arm/arch-sa1100/simpad.h Thu Feb 27 01:44:21 2003 @@ -46,7 +46,7 @@ #define IRQ_GPIO_CF_IRQ IRQ_GPIO1 #define IRQ_GPIO_CF_CD IRQ_GPIO24 -// CS3 Latch is write only, a shadow is neccessary +// CS3 Latch is write only, a shadow is necessary #define CS3BUSTYPE unsigned volatile long #define CS3_BASE 0xf1000000 diff -Nru a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h --- a/include/asm-arm/bitops.h Thu Feb 27 01:44:17 2003 +++ b/include/asm-arm/bitops.h Thu Feb 27 01:44:17 2003 @@ -9,7 +9,7 @@ * * Please note that the code in this file should never be included * from user space. Many of these are not implemented in assembler - * since they would be too costly. Also, they require priviledged + * since they would be too costly. Also, they require privileged * instructions (which are not available from user mode) to ensure * that they are atomic. */ diff -Nru a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h --- a/include/asm-arm/proc-fns.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-arm/proc-fns.h Thu Feb 27 01:44:23 2003 @@ -125,7 +125,7 @@ #if 0 * The following is to fool mkdep into generating the correct - * dependencies. Without this, it cant figure out that this + * dependencies. Without this, it can't figure out that this * file does indeed depend on the cpu-*.h files. #include #include diff -Nru a/include/asm-cris/namei.h b/include/asm-cris/namei.h --- a/include/asm-cris/namei.h Thu Feb 27 01:44:24 2003 +++ b/include/asm-cris/namei.h Thu Feb 27 01:44:24 2003 @@ -9,7 +9,7 @@ /* used to find file-system prefixes for doing emulations * see for example asm-sparc/namei.h - * we dont use it... + * we don't use it... */ #define __emul_prefix() NULL diff -Nru a/include/asm-cris/processor.h b/include/asm-cris/processor.h --- a/include/asm-cris/processor.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-cris/processor.h Thu Feb 27 01:44:23 2003 @@ -65,7 +65,7 @@ /* * At user->kernel entry, the pt_regs struct is stacked on the top of the kernel-stack. * This macro allows us to find those regs for a task. - * Notice that subsequent pt_regs stackings, like recursive interrupts occuring while + * Notice that subsequent pt_regs stackings, like recursive interrupts occurring while * we're in the kernel, won't affect this - only the first user->kernel transition * registers are reached by this. */ diff -Nru a/include/asm-cris/uaccess.h b/include/asm-cris/uaccess.h --- a/include/asm-cris/uaccess.h Thu Feb 27 01:44:18 2003 +++ b/include/asm-cris/uaccess.h Thu Feb 27 01:44:18 2003 @@ -126,7 +126,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. * * The "__xxx" versions of the user access functions are versions that * do not verify the address space, that must have been done previously diff -Nru a/include/asm-i386/mach-bigsmp/mach_apic.h b/include/asm-i386/mach-bigsmp/mach_apic.h --- a/include/asm-i386/mach-bigsmp/mach_apic.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-i386/mach-bigsmp/mach_apic.h Thu Feb 27 01:44:30 2003 @@ -10,7 +10,7 @@ ((phys_apic) & (~0xf)) ) #endif -#define no_balance_irq (1) +#define NO_BALANCE_IRQ (1) #define esr_disable (1) static inline int apic_id_registered(void) diff -Nru a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h --- a/include/asm-i386/mach-default/do_timer.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-i386/mach-default/do_timer.h Thu Feb 27 01:44:30 2003 @@ -67,7 +67,7 @@ #ifdef BUGGY_NEPTUN_TIMER /* * for the Neptun bug we know that the 'latch' - * command doesnt latch the high and low value + * command doesn't latch the high and low value * of the counter atomically. Thus we have to * substract 256 from the counter * ... funny, isnt it? :) diff -Nru a/include/asm-i386/mach-default/mach_apic.h b/include/asm-i386/mach-default/mach_apic.h --- a/include/asm-i386/mach-default/mach_apic.h Thu Feb 27 01:44:31 2003 +++ b/include/asm-i386/mach-default/mach_apic.h Thu Feb 27 01:44:31 2003 @@ -9,7 +9,7 @@ #define TARGET_CPUS 0x01 #endif -#define no_balance_irq (0) +#define NO_BALANCE_IRQ (0) #define esr_disable (0) #define INT_DELIVERY_MODE dest_LowestPrio diff -Nru a/include/asm-i386/mach-numaq/mach_apic.h b/include/asm-i386/mach-numaq/mach_apic.h --- a/include/asm-i386/mach-numaq/mach_apic.h Thu Feb 27 01:44:22 2003 +++ b/include/asm-i386/mach-numaq/mach_apic.h Thu Feb 27 01:44:22 2003 @@ -5,7 +5,7 @@ #define TARGET_CPUS (0xf) -#define no_balance_irq (1) +#define NO_BALANCE_IRQ (1) #define esr_disable (1) #define INT_DELIVERY_MODE dest_LowestPrio diff -Nru a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h --- a/include/asm-i386/mach-summit/mach_apic.h Thu Feb 27 01:44:25 2003 +++ b/include/asm-i386/mach-summit/mach_apic.h Thu Feb 27 01:44:25 2003 @@ -4,7 +4,7 @@ extern int x86_summit; #define esr_disable (x86_summit ? 1 : 0) -#define no_balance_irq (0) +#define NO_BALANCE_IRQ (0) #define XAPIC_DEST_CPUS_MASK 0x0Fu #define XAPIC_DEST_CLUSTER_MASK 0xF0u diff -Nru a/include/asm-i386/mach-visws/cobalt.h b/include/asm-i386/mach-visws/cobalt.h --- a/include/asm-i386/mach-visws/cobalt.h Thu Feb 27 01:44:18 2003 +++ b/include/asm-i386/mach-visws/cobalt.h Thu Feb 27 01:44:18 2003 @@ -60,7 +60,7 @@ #define CO_APIC_PCIA_BASE0 0 /* and 1 */ /* slot 0, line 0 */ #define CO_APIC_PCIA_BASE123 5 /* and 6 */ /* slot 0, line 1 */ -#define CO_APIC_PIIX4_USB 7 /* this one is wierd */ +#define CO_APIC_PIIX4_USB 7 /* this one is weird */ /* Lithium PCI Bridge B -- "the one with PIIX4" */ #define CO_APIC_PCIB_BASE0 8 /* and 9-12 *//* slot 0, line 0 */ diff -Nru a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h --- a/include/asm-i386/mmzone.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-i386/mmzone.h Thu Feb 27 01:44:23 2003 @@ -12,6 +12,8 @@ #ifdef CONFIG_X86_NUMAQ #include +#elif CONFIG_X86_SUMMIT +#include #else #define pfn_to_nid(pfn) (0) #endif /* CONFIG_X86_NUMAQ */ diff -Nru a/include/asm-i386/numaq.h b/include/asm-i386/numaq.h --- a/include/asm-i386/numaq.h Thu Feb 27 01:44:24 2003 +++ b/include/asm-i386/numaq.h Thu Feb 27 01:44:24 2003 @@ -168,6 +168,10 @@ struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */ }; +static inline unsigned long get_zholes_size(int nid) +{ + return 0; +} #endif /* CONFIG_X86_NUMAQ */ #endif /* NUMAQ_H */ diff -Nru a/include/asm-i386/numnodes.h b/include/asm-i386/numnodes.h --- a/include/asm-i386/numnodes.h Thu Feb 27 01:44:19 2003 +++ b/include/asm-i386/numnodes.h Thu Feb 27 01:44:19 2003 @@ -5,6 +5,8 @@ #ifdef CONFIG_X86_NUMAQ #include +#elif CONFIG_X86_SUMMIT +#include #else #define MAX_NUMNODES 1 #endif /* CONFIG_X86_NUMAQ */ diff -Nru a/include/asm-i386/page.h b/include/asm-i386/page.h --- a/include/asm-i386/page.h Thu Feb 27 01:44:19 2003 +++ b/include/asm-i386/page.h Thu Feb 27 01:44:19 2003 @@ -24,7 +24,7 @@ #else /* - * On older X86 processors its not a win to use MMX here it seems. + * On older X86 processors it's not a win to use MMX here it seems. * Maybe the K6-III ? */ @@ -49,6 +49,7 @@ typedef struct { unsigned long pte_low; } pte_t; typedef struct { unsigned long pmd; } pmd_t; typedef struct { unsigned long pgd; } pgd_t; +#define boot_pte_t pte_t /* or would you rather have a typedef */ #define pte_val(x) ((x).pte_low) #define HPAGE_SHIFT 22 #endif diff -Nru a/include/asm-i386/pgtable-2level.h b/include/asm-i386/pgtable-2level.h --- a/include/asm-i386/pgtable-2level.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-i386/pgtable-2level.h Thu Feb 27 01:44:23 2003 @@ -42,7 +42,7 @@ #define set_pte(pteptr, pteval) (*(pteptr) = pteval) #define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval) /* - * (pmds are folded into pgds so this doesnt get actually called, + * (pmds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) */ #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval) diff -Nru a/include/asm-i386/rwsem.h b/include/asm-i386/rwsem.h --- a/include/asm-i386/rwsem.h Thu Feb 27 01:44:22 2003 +++ b/include/asm-i386/rwsem.h Thu Feb 27 01:44:22 2003 @@ -33,7 +33,7 @@ #define _I386_RWSEM_H #ifndef _LINUX_RWSEM_H -#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead +#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #endif #ifdef __KERNEL__ diff -Nru a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h --- a/include/asm-i386/semaphore.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-i386/semaphore.h Thu Feb 27 01:44:21 2003 @@ -76,7 +76,7 @@ * *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); * * i'd rather use the more flexible initialization above, but sadly - * GCC 2.7.2.3 emits a bogus warning. EGCS doesnt. Oh well. + * GCC 2.7.2.3 emits a bogus warning. EGCS doesn't. Oh well. */ atomic_set(&sem->count, val); sem->sleepers = 0; diff -Nru a/include/asm-i386/sigcontext.h b/include/asm-i386/sigcontext.h --- a/include/asm-i386/sigcontext.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-i386/sigcontext.h Thu Feb 27 01:44:21 2003 @@ -11,7 +11,7 @@ * Pentium III FXSR, SSE support * Gareth Hughes , May 2000 * - * The FPU state data structure has had to grow to accomodate the + * The FPU state data structure has had to grow to accommodate the * extended FPU state required by the Streaming SIMD Extensions. * There is no documented standard to accomplish this at the moment. */ diff -Nru a/include/asm-i386/srat.h b/include/asm-i386/srat.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/include/asm-i386/srat.h Thu Feb 27 01:44:31 2003 @@ -0,0 +1,46 @@ +/* + * Some of the code in this file has been gleaned from the 64 bit + * discontigmem support code base. + * + * Copyright (C) 2002, IBM Corp. + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or + * NON INFRINGEMENT. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Send feedback to Pat Gaughen + */ + +#ifndef _ASM_SRAT_H_ +#define _ASM_SRAT_H_ + +/* + * each element in pfnnode_map represents 256 MB (2^28) of pages. + * so, to represent 64GB we need 256 elements. + */ +#define MAX_ELEMENTS 256 +#define PFN_TO_ELEMENT(pfn) ((pfn)>>(28 - PAGE_SHIFT)) + +extern int pfnnode_map[]; +#define pfn_to_nid(pfn) ({ pfnnode_map[PFN_TO_ELEMENT(pfn)]; }) +#define pfn_to_pgdat(pfn) NODE_DATA(pfn_to_nid(pfn)) +#define PHYSADDR_TO_NID(pa) pfn_to_nid(pa >> PAGE_SHIFT) +#define MAX_NUMNODES 8 +extern void get_memcfg_from_srat(void); +extern unsigned long *get_zholes_size(int); +#define get_memcfg_numa() get_memcfg_from_srat() + +#endif /* _ASM_SRAT_H_ */ diff -Nru a/include/asm-i386/uaccess.h b/include/asm-i386/uaccess.h --- a/include/asm-i386/uaccess.h Thu Feb 27 01:44:19 2003 +++ b/include/asm-i386/uaccess.h Thu Feb 27 01:44:19 2003 @@ -101,7 +101,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. * * The "__xxx" versions of the user access functions are versions that * do not verify the address space, that must have been done previously @@ -258,7 +258,7 @@ unsigned long __copy_from_user_ll(void *to, const void *from, unsigned long n); /* - * Here we special-case 1, 2 and 4-byte copy_*_user invokations. On a fault + * Here we special-case 1, 2 and 4-byte copy_*_user invocations. On a fault * we return the initial request size (1, 2 or 4), as copy_*_user should do. * If a store crosses a page boundary and gets a fault, the x86 will not write * anything, so this is accurate. diff -Nru a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h --- a/include/asm-ia64/mmzone.h Thu Feb 27 01:44:31 2003 +++ b/include/asm-ia64/mmzone.h Thu Feb 27 01:44:31 2003 @@ -44,7 +44,7 @@ * Note that IO addresses are NOT considered valid addresses. * * Note, many platforms can simply check if kaddr exceeds a specific size. - * (However, this wont work on SGI platforms since IO space is embedded + * (However, this won't work on SGI platforms since IO space is embedded * within the range of valid memory addresses & nodes have holes in the * address range between banks). */ diff -Nru a/include/asm-ia64/sn/klconfig.h b/include/asm-ia64/sn/klconfig.h --- a/include/asm-ia64/sn/klconfig.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-ia64/sn/klconfig.h Thu Feb 27 01:44:21 2003 @@ -273,7 +273,7 @@ * Each BOARD consists of COMPONENTs and the BOARD structure has * pointers (offsets) to its COMPONENT structure. * The COMPONENT structure has version info, size and speed info, revision, - * error info and the NIC info. This structure can accomodate any + * error info and the NIC info. This structure can accommodate any * BOARD with arbitrary COMPONENT composition. * * The ERRORINFO part of each BOARD has error information diff -Nru a/include/asm-ia64/sn/pci/bridge.h b/include/asm-ia64/sn/pci/bridge.h --- a/include/asm-ia64/sn/pci/bridge.h Thu Feb 27 01:44:20 2003 +++ b/include/asm-ia64/sn/pci/bridge.h Thu Feb 27 01:44:20 2003 @@ -14,7 +14,7 @@ * bridge.h - header file for bridge chip and bridge portion of xbridge chip * * Also including offsets for unique PIC registers. - * The PIC asic is a follow-on to Xbridge and most of it's registers are + * The PIC asic is a follow-on to Xbridge and most of its registers are * identical to those of Xbridge. PIC is different than Xbridge in that * it will accept 64 bit register access and that, in some cases, data * is kept in bits 63:32. PIC registers that are identical to Xbridge @@ -1684,7 +1684,7 @@ /* RRB clear register */ #define BRIDGE_RRB_CLEAR(r) (0x00000001<<(r)) -/* Defines for the virtual channels so we dont hardcode 0-3 within code */ +/* Defines for the virtual channels so we don't hardcode 0-3 within code */ #define VCHAN0 0 /* virtual channel 0 (ie. the "normal" channel) */ #define VCHAN1 1 /* virtual channel 1 */ #define VCHAN2 2 /* virtual channel 2 - PIC only */ diff -Nru a/include/asm-ia64/sn/pci/pcibr_private.h b/include/asm-ia64/sn/pci/pcibr_private.h --- a/include/asm-ia64/sn/pci/pcibr_private.h Thu Feb 27 01:44:16 2003 +++ b/include/asm-ia64/sn/pci/pcibr_private.h Thu Feb 27 01:44:16 2003 @@ -578,7 +578,7 @@ #ifdef LATER toid_t bserr_toutid; /* Timeout started by errintr */ #endif /* LATER */ - iopaddr_t bserr_addr; /* Address where error occured */ + iopaddr_t bserr_addr; /* Address where error occurred */ uint64_t bserr_intstat; /* interrupts active at error dump */ } bs_errinfo; diff -Nru a/include/asm-ia64/sn/pda.h b/include/asm-ia64/sn/pda.h --- a/include/asm-ia64/sn/pda.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-ia64/sn/pda.h Thu Feb 27 01:44:30 2003 @@ -84,10 +84,10 @@ * the IA64 cpu_data area. A full page is allocated for the cp_data area for each * cpu but only a small amout of the page is actually used. We put the SNIA PDA * in the same page as the cpu_data area. Note that there is a check in the setup - * code to verify that we dont overflow the page. + * code to verify that we don't overflow the page. * * Seems like we should should cache-line align the pda so that any changes in the - * size of the cpu_data area dont change cache layout. Should we align to 32, 64, 128 + * size of the cpu_data area don't change cache layout. Should we align to 32, 64, 128 * or 512 boundary. Each has merits. For now, pick 128 but should be revisited later. */ DECLARE_PER_CPU(struct pda_s, pda_percpu); diff -Nru a/include/asm-ia64/sn/sn1/mmzone_sn1.h b/include/asm-ia64/sn/sn1/mmzone_sn1.h --- a/include/asm-ia64/sn/sn1/mmzone_sn1.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-ia64/sn/sn1/mmzone_sn1.h Thu Feb 27 01:44:30 2003 @@ -130,7 +130,7 @@ /* * Calculate a "goal" value to be passed to __alloc_bootmem_node for allocating structures on - * nodes so that they dont alias to the same line in the cache as the previous allocated structure. + * nodes so that they don't alias to the same line in the cache as the previous allocated structure. * This macro takes an address of the end of previous allocation, rounds it to a page boundary & * changes the node number. */ diff -Nru a/include/asm-ia64/sn/sn2/mmzone_sn2.h b/include/asm-ia64/sn/sn2/mmzone_sn2.h --- a/include/asm-ia64/sn/sn2/mmzone_sn2.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-ia64/sn/sn2/mmzone_sn2.h Thu Feb 27 01:44:30 2003 @@ -137,7 +137,7 @@ /* * Calculate a "goal" value to be passed to __alloc_bootmem_node for allocating structures on - * nodes so that they dont alias to the same line in the cache as the previous allocated structure. + * nodes so that they don't alias to the same line in the cache as the previous allocated structure. * This macro takes an address of the end of previous allocation, rounds it to a page boundary & * changes the node number. */ diff -Nru a/include/asm-ia64/sn/sn2/shub_mmr.h b/include/asm-ia64/sn/sn2/shub_mmr.h --- a/include/asm-ia64/sn/sn2/shub_mmr.h Thu Feb 27 01:44:26 2003 +++ b/include/asm-ia64/sn/sn2/shub_mmr.h Thu Feb 27 01:44:27 2003 @@ -2720,7 +2720,7 @@ #define SH_NI0_LLP_ERR_RETRY_COUNT_MASK 0x0000000000ff0000 /* SH_NI0_LLP_ERR_RETRY_TIMEOUT */ -/* Description: Indicates a retry timeout has occured */ +/* Description: Indicates a retry timeout has occurred */ #define SH_NI0_LLP_ERR_RETRY_TIMEOUT_SHFT 24 #define SH_NI0_LLP_ERR_RETRY_TIMEOUT_MASK 0x0000000001000000 @@ -3017,7 +3017,7 @@ #define SH_NI1_LLP_ERR_RETRY_COUNT_MASK 0x0000000000ff0000 /* SH_NI1_LLP_ERR_RETRY_TIMEOUT */ -/* Description: Indicates a retry timeout has occured */ +/* Description: Indicates a retry timeout has occurred */ #define SH_NI1_LLP_ERR_RETRY_TIMEOUT_SHFT 24 #define SH_NI1_LLP_ERR_RETRY_TIMEOUT_MASK 0x0000000001000000 @@ -26034,7 +26034,7 @@ #define SH_PIO_WRITE_STATUS_0_INIT 0x8000000000000000 /* SH_PIO_WRITE_STATUS_0_MULTI_WRITE_ERROR */ -/* Description: More than one PIO write error occured */ +/* Description: More than one PIO write error occurred */ #define SH_PIO_WRITE_STATUS_0_MULTI_WRITE_ERROR_SHFT 0 #define SH_PIO_WRITE_STATUS_0_MULTI_WRITE_ERROR_MASK 0x0000000000000001 @@ -26073,7 +26073,7 @@ #define SH_PIO_WRITE_STATUS_1_INIT 0x8000000000000000 /* SH_PIO_WRITE_STATUS_1_MULTI_WRITE_ERROR */ -/* Description: More than one PIO write error occured */ +/* Description: More than one PIO write error occurred */ #define SH_PIO_WRITE_STATUS_1_MULTI_WRITE_ERROR_SHFT 0 #define SH_PIO_WRITE_STATUS_1_MULTI_WRITE_ERROR_MASK 0x0000000000000001 diff -Nru a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h --- a/include/asm-ia64/sn/sn_cpuid.h Thu Feb 27 01:44:19 2003 +++ b/include/asm-ia64/sn/sn_cpuid.h Thu Feb 27 01:44:19 2003 @@ -47,7 +47,7 @@ * hard_smp_processor_id()- cpu_physical_id of current processor * cpu_physical_id(cpuid) - convert a to a * cpu_logical_id(phy_id) - convert a to a - * * not real efficient - dont use in perf critical code + * * not real efficient - don't use in perf critical code * * LID - processor defined register (see PRM V2). * diff -Nru a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h --- a/include/asm-m68k/dvma.h Thu Feb 27 01:44:25 2003 +++ b/include/asm-m68k/dvma.h Thu Feb 27 01:44:25 2003 @@ -45,7 +45,7 @@ #define IOMMU_ENTRIES 120 /* empirical kludge -- dvma regions only seem to work right on 0x10000 - byte boundries */ + byte boundaries */ #define DVMA_REGION_SIZE 0x10000 #define DVMA_ALIGN(addr) (((addr)+DVMA_REGION_SIZE-1) & \ ~(DVMA_REGION_SIZE-1)) diff -Nru a/include/asm-m68k/io.h b/include/asm-m68k/io.h --- a/include/asm-m68k/io.h Thu Feb 27 01:44:25 2003 +++ b/include/asm-m68k/io.h Thu Feb 27 01:44:25 2003 @@ -250,7 +250,7 @@ #define readl(addr) in_le32(addr) #define writel(val,addr) out_le32((addr),(val)) -/* those can be defined for both ISA and PCI - it wont work though */ +/* those can be defined for both ISA and PCI - it won't work though */ #define readb(addr) in_8(addr) #define readw(addr) in_le16(addr) #define writeb(val,addr) out_8((addr),(val)) diff -Nru a/include/asm-m68k/page.h b/include/asm-m68k/page.h --- a/include/asm-m68k/page.h Thu Feb 27 01:44:31 2003 +++ b/include/asm-m68k/page.h Thu Feb 27 01:44:31 2003 @@ -164,7 +164,7 @@ * NOTE: virtual isn't really correct, actually it should be the offset into the * memory node, but we have no highmem, so that works for now. * TODO: implement (fast) pfn<->pgdat_idx conversion functions, this makes lots - * of the shifts unneccessary. + * of the shifts unnecessary. */ #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) diff -Nru a/include/asm-m68k/posix_types.h b/include/asm-m68k/posix_types.h --- a/include/asm-m68k/posix_types.h Thu Feb 27 01:44:18 2003 +++ b/include/asm-m68k/posix_types.h Thu Feb 27 01:44:18 2003 @@ -22,6 +22,8 @@ typedef long __kernel_time_t; typedef long __kernel_suseconds_t; typedef long __kernel_clock_t; +typedef int __kernel_timer_t; +typedef int __kernel_clockid_t; typedef int __kernel_daddr_t; typedef char * __kernel_caddr_t; typedef unsigned short __kernel_uid16_t; diff -Nru a/include/asm-m68k/swim_iop.h b/include/asm-m68k/swim_iop.h --- a/include/asm-m68k/swim_iop.h Thu Feb 27 01:44:19 2003 +++ b/include/asm-m68k/swim_iop.h Thu Feb 27 01:44:19 2003 @@ -60,7 +60,7 @@ #define gcrOnMFMErr -400 /* GCR (400/800K) on HD media */ #define verErr -84 /* verify failed */ -#define fmt2Err -83 /* cant get enough sync during format */ +#define fmt2Err -83 /* can't get enough sync during format */ #define fmt1Err -82 /* can't find sector 0 after track format */ #define sectNFErr -81 /* can't find sector */ #define seekErr -80 /* drive error during seek */ diff -Nru a/include/asm-m68knommu/MC68328.h b/include/asm-m68knommu/MC68328.h --- a/include/asm-m68knommu/MC68328.h Thu Feb 27 01:44:20 2003 +++ b/include/asm-m68knommu/MC68328.h Thu Feb 27 01:44:20 2003 @@ -1237,10 +1237,10 @@ #define RTCISR WORD_REF(RTCISR_ADDR) #define RTCISR_SW 0x0001 /* Stopwatch timed out */ -#define RTCISR_MIN 0x0002 /* 1-minute interrupt has occured */ -#define RTCISR_ALM 0x0004 /* Alarm interrupt has occured */ -#define RTCISR_DAY 0x0008 /* 24-hour rollover interrupt has occured */ -#define RTCISR_1HZ 0x0010 /* 1Hz interrupt has occured */ +#define RTCISR_MIN 0x0002 /* 1-minute interrupt has occurred */ +#define RTCISR_ALM 0x0004 /* Alarm interrupt has occurred */ +#define RTCISR_DAY 0x0008 /* 24-hour rollover interrupt has occurred */ +#define RTCISR_1HZ 0x0010 /* 1Hz interrupt has occurred */ /* * RTC Interrupt Enable Register diff -Nru a/include/asm-m68knommu/MC68EZ328.h b/include/asm-m68knommu/MC68EZ328.h --- a/include/asm-m68knommu/MC68EZ328.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-m68knommu/MC68EZ328.h Thu Feb 27 01:44:30 2003 @@ -1071,19 +1071,19 @@ #define RTCISR WORD_REF(RTCISR_ADDR) #define RTCISR_SW 0x0001 /* Stopwatch timed out */ -#define RTCISR_MIN 0x0002 /* 1-minute interrupt has occured */ -#define RTCISR_ALM 0x0004 /* Alarm interrupt has occured */ -#define RTCISR_DAY 0x0008 /* 24-hour rollover interrupt has occured */ -#define RTCISR_1HZ 0x0010 /* 1Hz interrupt has occured */ -#define RTCISR_HR 0x0020 /* 1-hour interrupt has occured */ -#define RTCISR_SAM0 0x0100 /* 4Hz / 4.6875Hz interrupt has occured */ -#define RTCISR_SAM1 0x0200 /* 8Hz / 9.3750Hz interrupt has occured */ -#define RTCISR_SAM2 0x0400 /* 16Hz / 18.7500Hz interrupt has occured */ -#define RTCISR_SAM3 0x0800 /* 32Hz / 37.5000Hz interrupt has occured */ -#define RTCISR_SAM4 0x1000 /* 64Hz / 75.0000Hz interrupt has occured */ -#define RTCISR_SAM5 0x2000 /* 128Hz / 150.0000Hz interrupt has occured */ -#define RTCISR_SAM6 0x4000 /* 256Hz / 300.0000Hz interrupt has occured */ -#define RTCISR_SAM7 0x8000 /* 512Hz / 600.0000Hz interrupt has occured */ +#define RTCISR_MIN 0x0002 /* 1-minute interrupt has occurred */ +#define RTCISR_ALM 0x0004 /* Alarm interrupt has occurred */ +#define RTCISR_DAY 0x0008 /* 24-hour rollover interrupt has occurred */ +#define RTCISR_1HZ 0x0010 /* 1Hz interrupt has occurred */ +#define RTCISR_HR 0x0020 /* 1-hour interrupt has occurred */ +#define RTCISR_SAM0 0x0100 /* 4Hz / 4.6875Hz interrupt has occurred */ +#define RTCISR_SAM1 0x0200 /* 8Hz / 9.3750Hz interrupt has occurred */ +#define RTCISR_SAM2 0x0400 /* 16Hz / 18.7500Hz interrupt has occurred */ +#define RTCISR_SAM3 0x0800 /* 32Hz / 37.5000Hz interrupt has occurred */ +#define RTCISR_SAM4 0x1000 /* 64Hz / 75.0000Hz interrupt has occurred */ +#define RTCISR_SAM5 0x2000 /* 128Hz / 150.0000Hz interrupt has occurred */ +#define RTCISR_SAM6 0x4000 /* 256Hz / 300.0000Hz interrupt has occurred */ +#define RTCISR_SAM7 0x8000 /* 512Hz / 600.0000Hz interrupt has occurred */ /* * RTC Interrupt Enable Register diff -Nru a/include/asm-m68knommu/MC68VZ328.h b/include/asm-m68knommu/MC68VZ328.h --- a/include/asm-m68knommu/MC68VZ328.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-m68knommu/MC68VZ328.h Thu Feb 27 01:44:21 2003 @@ -1167,19 +1167,19 @@ #define RTCISR WORD_REF(RTCISR_ADDR) #define RTCISR_SW 0x0001 /* Stopwatch timed out */ -#define RTCISR_MIN 0x0002 /* 1-minute interrupt has occured */ -#define RTCISR_ALM 0x0004 /* Alarm interrupt has occured */ -#define RTCISR_DAY 0x0008 /* 24-hour rollover interrupt has occured */ -#define RTCISR_1HZ 0x0010 /* 1Hz interrupt has occured */ -#define RTCISR_HR 0x0020 /* 1-hour interrupt has occured */ -#define RTCISR_SAM0 0x0100 /* 4Hz / 4.6875Hz interrupt has occured */ -#define RTCISR_SAM1 0x0200 /* 8Hz / 9.3750Hz interrupt has occured */ -#define RTCISR_SAM2 0x0400 /* 16Hz / 18.7500Hz interrupt has occured */ -#define RTCISR_SAM3 0x0800 /* 32Hz / 37.5000Hz interrupt has occured */ -#define RTCISR_SAM4 0x1000 /* 64Hz / 75.0000Hz interrupt has occured */ -#define RTCISR_SAM5 0x2000 /* 128Hz / 150.0000Hz interrupt has occured */ -#define RTCISR_SAM6 0x4000 /* 256Hz / 300.0000Hz interrupt has occured */ -#define RTCISR_SAM7 0x8000 /* 512Hz / 600.0000Hz interrupt has occured */ +#define RTCISR_MIN 0x0002 /* 1-minute interrupt has occurred */ +#define RTCISR_ALM 0x0004 /* Alarm interrupt has occurred */ +#define RTCISR_DAY 0x0008 /* 24-hour rollover interrupt has occurred */ +#define RTCISR_1HZ 0x0010 /* 1Hz interrupt has occurred */ +#define RTCISR_HR 0x0020 /* 1-hour interrupt has occurred */ +#define RTCISR_SAM0 0x0100 /* 4Hz / 4.6875Hz interrupt has occurred */ +#define RTCISR_SAM1 0x0200 /* 8Hz / 9.3750Hz interrupt has occurred */ +#define RTCISR_SAM2 0x0400 /* 16Hz / 18.7500Hz interrupt has occurred */ +#define RTCISR_SAM3 0x0800 /* 32Hz / 37.5000Hz interrupt has occurred */ +#define RTCISR_SAM4 0x1000 /* 64Hz / 75.0000Hz interrupt has occurred */ +#define RTCISR_SAM5 0x2000 /* 128Hz / 150.0000Hz interrupt has occurred */ +#define RTCISR_SAM6 0x4000 /* 256Hz / 300.0000Hz interrupt has occurred */ +#define RTCISR_SAM7 0x8000 /* 512Hz / 600.0000Hz interrupt has occurred */ /* * RTC Interrupt Enable Register diff -Nru a/include/asm-m68knommu/mcftimer.h b/include/asm-m68knommu/mcftimer.h --- a/include/asm-m68knommu/mcftimer.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-m68knommu/mcftimer.h Thu Feb 27 01:44:23 2003 @@ -40,6 +40,18 @@ #define MCFTIMER_TCN 0x06 /* Timer Counter reg (r/w) */ #define MCFTIMER_TER 0x11 /* Timer Event reg (r/w) */ +struct mcftimer { + unsigned short tmr; /* Timer Mode reg (r/w) */ + unsigned short reserved1; + unsigned short trr; /* Timer Reference (r/w) */ + unsigned short reserved2; + unsigned short tcr; /* Timer Capture reg (r/w) */ + unsigned short reserved3; + unsigned short tcn; /* Timer Counter reg (r/w) */ + unsigned short reserved4; + unsigned char reserved5; + unsigned char ter; /* Timer Event reg (r/w) */ +} __attribute__((packed)); /* * Bit definitions for the Timer Mode Register (TMR). diff -Nru a/include/asm-m68knommu/siginfo.h b/include/asm-m68knommu/siginfo.h --- a/include/asm-m68knommu/siginfo.h Thu Feb 27 01:44:20 2003 +++ b/include/asm-m68knommu/siginfo.h Thu Feb 27 01:44:20 2003 @@ -1 +1,6 @@ -#include +#ifndef _M68KNOMMU_SIGINFO_H +#define _M68KNOMMU_SIGINFO_H + +#include + +#endif diff -Nru a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h --- a/include/asm-m68knommu/unistd.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-m68knommu/unistd.h Thu Feb 27 01:44:23 2003 @@ -221,6 +221,8 @@ #define __NR_setfsuid32 215 #define __NR_setfsgid32 216 +#define NR_syscalls 256 + /* user-visible error numbers are in the range -1 - -122: see */ diff -Nru a/include/asm-mips/ddb5xxx/ddb5xxx.h b/include/asm-mips/ddb5xxx/ddb5xxx.h --- a/include/asm-mips/ddb5xxx/ddb5xxx.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-mips/ddb5xxx/ddb5xxx.h Thu Feb 27 01:44:23 2003 @@ -34,7 +34,7 @@ * that are true for all DDB 5xxx boards. The modification is based on * * uPD31577(VRC5477) VR5432-SDRAM/PCI Bridge (Luke) - * Preliminary Specification Decoment, Rev 1.1, 27 Dec, 2000 + * Preliminary Specification Document, Rev 1.1, 27 Dec, 2000 * */ diff -Nru a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h --- a/include/asm-mips/mipsregs.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-mips/mipsregs.h Thu Feb 27 01:44:23 2003 @@ -528,7 +528,7 @@ #define CE1_SP_HINT_TO_SHARED_SC_BLOCKS 15 /* - * These flags define in which priviledge mode the counters count events + * These flags define in which privilege mode the counters count events */ #define CEB_USER 8 /* Count events in user mode, EXL = ERL = 0 */ #define CEB_SUPERVISOR 4 /* Count events in supvervisor mode EXL = ERL = 0 */ diff -Nru a/include/asm-mips/pci.h b/include/asm-mips/pci.h --- a/include/asm-mips/pci.h Thu Feb 27 01:44:26 2003 +++ b/include/asm-mips/pci.h Thu Feb 27 01:44:26 2003 @@ -102,7 +102,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ extern inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff -Nru a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h --- a/include/asm-mips/pgtable.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-mips/pgtable.h Thu Feb 27 01:44:21 2003 @@ -291,7 +291,7 @@ } /* - * (pmds are folded into pgds so this doesnt get actually called, + * (pmds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) */ #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval) diff -Nru a/include/asm-mips/processor.h b/include/asm-mips/processor.h --- a/include/asm-mips/processor.h Thu Feb 27 01:44:17 2003 +++ b/include/asm-mips/processor.h Thu Feb 27 01:44:17 2003 @@ -228,7 +228,7 @@ * Do necessary setup to start up a newly executed thread. */ #define start_thread(regs, new_pc, new_sp) do { \ - /* New thread looses kernel privileges. */ \ + /* New thread loses kernel privileges. */ \ regs->cp0_status = (regs->cp0_status & ~(ST0_CU0|ST0_KSU)) | KU_USER;\ regs->cp0_epc = new_pc; \ regs->regs[29] = new_sp; \ diff -Nru a/include/asm-mips64/mipsregs.h b/include/asm-mips64/mipsregs.h --- a/include/asm-mips64/mipsregs.h Thu Feb 27 01:44:27 2003 +++ b/include/asm-mips64/mipsregs.h Thu Feb 27 01:44:27 2003 @@ -310,7 +310,7 @@ #define CE1_SP_HINT_TO_SHARED_SC_BLOCKS 15 /* - * These flags define in which priviledge mode the counters count events + * These flags define in which privilege mode the counters count events */ #define CEB_USER 8 /* Count events in user mode, EXL = ERL = 0 */ #define CEB_SUPERVISOR 4 /* Count events in supvervisor mode EXL = ERL = 0 */ diff -Nru a/include/asm-mips64/pci.h b/include/asm-mips64/pci.h --- a/include/asm-mips64/pci.h Thu Feb 27 01:44:18 2003 +++ b/include/asm-mips64/pci.h Thu Feb 27 01:44:18 2003 @@ -126,7 +126,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff -Nru a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h --- a/include/asm-mips64/pgtable.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-mips64/pgtable.h Thu Feb 27 01:44:31 2003 @@ -318,7 +318,7 @@ } /* - * (pmds are folded into pgds so this doesnt get actually called, + * (pmds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) */ #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval) diff -Nru a/include/asm-mips64/processor.h b/include/asm-mips64/processor.h --- a/include/asm-mips64/processor.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-mips64/processor.h Thu Feb 27 01:44:23 2003 @@ -256,7 +256,7 @@ do { \ unsigned long __status; \ \ - /* New thread looses kernel privileges. */ \ + /* New thread loses kernel privileges. */ \ __status = regs->cp0_status & ~(ST0_CU0|ST0_FR|ST0_KSU); \ __status |= KSU_USER; \ __status |= (current->thread.mflags & MF_32BIT) ? 0 : ST0_FR; \ diff -Nru a/include/asm-mips64/sn/klconfig.h b/include/asm-mips64/sn/klconfig.h --- a/include/asm-mips64/sn/klconfig.h Thu Feb 27 01:44:24 2003 +++ b/include/asm-mips64/sn/klconfig.h Thu Feb 27 01:44:24 2003 @@ -293,7 +293,7 @@ * Each BOARD consists of COMPONENTs and the BOARD structure has * pointers (offsets) to its COMPONENT structure. * The COMPONENT structure has version info, size and speed info, revision, - * error info and the NIC info. This structure can accomodate any + * error info and the NIC info. This structure can accommodate any * BOARD with arbitrary COMPONENT composition. * * The ERRORINFO part of each BOARD has error information diff -Nru a/include/asm-parisc/assembly.h b/include/asm-parisc/assembly.h --- a/include/asm-parisc/assembly.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-parisc/assembly.h Thu Feb 27 01:44:23 2003 @@ -381,7 +381,7 @@ /* cr11 (sar) is a funny one. 5 bits on PA1.1 and 6 bit on PA2.0 * For PA2.0 mtsar or mtctl always write 6 bits, but mfctl only * reads 5 bits. Use mfctl,w to read all six bits. Otherwise - * we loose the 6th bit on a save/restore over interrupt. + * we lose the 6th bit on a save/restore over interrupt. */ mfctl,w %cr11, %r1 STREG %r1, PT_SAR (\regs) diff -Nru a/include/asm-parisc/eisa_eeprom.h b/include/asm-parisc/eisa_eeprom.h --- a/include/asm-parisc/eisa_eeprom.h Thu Feb 27 01:44:24 2003 +++ b/include/asm-parisc/eisa_eeprom.h Thu Feb 27 01:44:24 2003 @@ -25,7 +25,7 @@ u_int8_t ver_maj; u_int8_t ver_min; u_int8_t num_slots; /* number of EISA slots in system */ - u_int16_t csum; /* checksum, I dont know how to calulate this */ + u_int16_t csum; /* checksum, I don't know how to calulate this */ u_int8_t pad[10]; } __attribute__ ((packed)); diff -Nru a/include/asm-parisc/mman.h b/include/asm-parisc/mman.h --- a/include/asm-parisc/mman.h Thu Feb 27 01:44:25 2003 +++ b/include/asm-parisc/mman.h Thu Feb 27 01:44:25 2003 @@ -32,7 +32,7 @@ #define MADV_RANDOM 1 /* expect random page references */ #define MADV_SEQUENTIAL 2 /* expect sequential page references */ #define MADV_WILLNEED 3 /* will need these pages */ -#define MADV_DONTNEED 4 /* dont need these pages */ +#define MADV_DONTNEED 4 /* don't need these pages */ #define MADV_SPACEAVAIL 5 /* insure that resources are reserved */ #define MADV_VPS_PURGE 6 /* Purge pages from VM page cache */ #define MADV_VPS_INHERIT 7 /* Inherit parents page size */ diff -Nru a/include/asm-parisc/pdc_chassis.h b/include/asm-parisc/pdc_chassis.h --- a/include/asm-parisc/pdc_chassis.h Thu Feb 27 01:44:17 2003 +++ b/include/asm-parisc/pdc_chassis.h Thu Feb 27 01:44:17 2003 @@ -116,7 +116,7 @@ PDC_CHASSIS_LED_ATTN_OFF | \ PDC_CHASSIS_LED_FAULT_ON | \ PDC_CHASSIS_LED_VALID ) -/* Unexpected reboot occured - Executing non-OS code */ +/* Unexpected reboot occurred - Executing non-OS code */ #define PDC_CHASSIS_LSTATE_NONOS_UNEXP (PDC_CHASSIS_LED_RUN_FLASH | \ PDC_CHASSIS_LED_ATTN_OFF | \ PDC_CHASSIS_LED_FAULT_FLASH | \ diff -Nru a/include/asm-ppc/page.h b/include/asm-ppc/page.h --- a/include/asm-ppc/page.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-ppc/page.h Thu Feb 27 01:44:21 2003 @@ -58,7 +58,7 @@ #endif -/* align addr on a size boundry - adjust address up if needed -- Cort */ +/* align addr on a size boundary - adjust address up if needed -- Cort */ #define _ALIGN(addr,size) (((addr)+(size)-1)&(~((size)-1))) /* to align the pointer to the (next) page boundary */ diff -Nru a/include/asm-ppc/uaccess.h b/include/asm-ppc/uaccess.h --- a/include/asm-ppc/uaccess.h Thu Feb 27 01:44:17 2003 +++ b/include/asm-ppc/uaccess.h Thu Feb 27 01:44:17 2003 @@ -65,7 +65,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. * * The "__xxx" versions of the user access functions are versions that * do not verify the address space, that must have been done previously diff -Nru a/include/asm-ppc/uninorth.h b/include/asm-ppc/uninorth.h --- a/include/asm-ppc/uninorth.h Thu Feb 27 01:44:28 2003 +++ b/include/asm-ppc/uninorth.h Thu Feb 27 01:44:28 2003 @@ -111,7 +111,7 @@ #define UNI_N_ARB_CTRL_QACK_DELAY105 0x00 /* This one _might_ return the CPU number of the CPU reading it; - * the bootROM decides wether to boot or to sleep/spinloop depending + * the bootROM decides whether to boot or to sleep/spinloop depending * on this register beeing 0 or not */ #define UNI_N_CPU_NUMBER 0x0050 diff -Nru a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h --- a/include/asm-ppc64/page.h Thu Feb 27 01:44:17 2003 +++ b/include/asm-ppc64/page.h Thu Feb 27 01:44:17 2003 @@ -114,11 +114,11 @@ #endif /* __ASSEMBLY__ */ -/* align addr on a size boundry - adjust address up/down if needed */ +/* align addr on a size boundary - adjust address up/down if needed */ #define _ALIGN_UP(addr,size) (((addr)+((size)-1))&(~((size)-1))) #define _ALIGN_DOWN(addr,size) ((addr)&(~((size)-1))) -/* align addr on a size boundry - adjust address up if needed */ +/* align addr on a size boundary - adjust address up if needed */ #define _ALIGN(addr,size) _ALIGN_UP(addr,size) /* to align the pointer to the (next) double word boundary */ diff -Nru a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h --- a/include/asm-ppc64/pgtable.h Thu Feb 27 01:44:30 2003 +++ b/include/asm-ppc64/pgtable.h Thu Feb 27 01:44:30 2003 @@ -198,7 +198,7 @@ * Find an entry in a page-table-directory. We combine the address region * (the high order N bits) and the pgd portion of the address. */ -/* to avoid overflow in free_pgtables we dont use PTRS_PER_PGD here */ +/* to avoid overflow in free_pgtables we don't use PTRS_PER_PGD here */ #define pgd_index(address) (((address) >> (PGDIR_SHIFT)) & 0x7ff) #define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) diff -Nru a/include/asm-ppc64/uaccess.h b/include/asm-ppc64/uaccess.h --- a/include/asm-ppc64/uaccess.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-ppc64/uaccess.h Thu Feb 27 01:44:23 2003 @@ -73,7 +73,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. * * The "__xxx" versions of the user access functions are versions that * do not verify the address space, that must have been done previously diff -Nru a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h --- a/include/asm-s390/ccwdev.h Thu Feb 27 01:44:28 2003 +++ b/include/asm-s390/ccwdev.h Thu Feb 27 01:44:28 2003 @@ -120,7 +120,7 @@ /* device is no longer available */ int (*set_online) (struct ccw_device *); int (*set_offline) (struct ccw_device *); - struct device_driver driver; /* higher level structure, dont init + struct device_driver driver; /* higher level structure, don't init this from your driver */ char *name; }; diff -Nru a/include/asm-s390/processor.h b/include/asm-s390/processor.h --- a/include/asm-s390/processor.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-s390/processor.h Thu Feb 27 01:44:23 2003 @@ -154,7 +154,7 @@ } /* - * Function to stop a processor until an interruption occured + * Function to stop a processor until an interruption occurred */ static inline void enabled_wait(void) { diff -Nru a/include/asm-s390/rwsem.h b/include/asm-s390/rwsem.h --- a/include/asm-s390/rwsem.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-s390/rwsem.h Thu Feb 27 01:44:23 2003 @@ -38,7 +38,7 @@ */ #ifndef _LINUX_RWSEM_H -#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead +#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #endif #ifdef __KERNEL__ diff -Nru a/include/asm-s390/types.h b/include/asm-s390/types.h --- a/include/asm-s390/types.h Thu Feb 27 01:44:23 2003 +++ b/include/asm-s390/types.h Thu Feb 27 01:44:23 2003 @@ -32,7 +32,7 @@ typedef unsigned long long __u64; #endif /* A address type so that arithmetic can be done on it & it can be upgraded to - 64 bit when neccessary + 64 bit when necessary */ typedef __u32 addr_t; typedef __s32 saddr_t; diff -Nru a/include/asm-s390x/ccwdev.h b/include/asm-s390x/ccwdev.h --- a/include/asm-s390x/ccwdev.h Thu Feb 27 01:44:27 2003 +++ b/include/asm-s390x/ccwdev.h Thu Feb 27 01:44:27 2003 @@ -120,7 +120,7 @@ /* device is no longer available */ int (*set_online) (struct ccw_device *); int (*set_offline) (struct ccw_device *); - struct device_driver driver; /* higher level structure, dont init + struct device_driver driver; /* higher level structure, don't init this from your driver */ char *name; }; diff -Nru a/include/asm-s390x/processor.h b/include/asm-s390x/processor.h --- a/include/asm-s390x/processor.h Thu Feb 27 01:44:27 2003 +++ b/include/asm-s390x/processor.h Thu Feb 27 01:44:27 2003 @@ -168,7 +168,7 @@ } /* - * Function to stop a processor until an interruption occured + * Function to stop a processor until an interruption occurred */ static inline void enabled_wait(void) { diff -Nru a/include/asm-s390x/rwsem.h b/include/asm-s390x/rwsem.h --- a/include/asm-s390x/rwsem.h Thu Feb 27 01:44:21 2003 +++ b/include/asm-s390x/rwsem.h Thu Feb 27 01:44:21 2003 @@ -38,7 +38,7 @@ */ #ifndef _LINUX_RWSEM_H -#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead +#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #endif #ifdef __KERNEL__ diff -Nru a/include/asm-s390x/types.h b/include/asm-s390x/types.h --- a/include/asm-s390x/types.h Thu Feb 27 01:44:22 2003 +++ b/include/asm-s390x/types.h Thu Feb 27 01:44:22 2003 @@ -32,7 +32,7 @@ /* * A address type so that arithmetic can be done on it & it can be upgraded to - * 64 bit when neccessary + * 64 bit when necessary */ typedef unsigned long addr_t; diff -Nru a/include/asm-sh/pci.h b/include/asm-sh/pci.h --- a/include/asm-sh/pci.h Thu Feb 27 01:44:25 2003 +++ b/include/asm-sh/pci.h Thu Feb 27 01:44:25 2003 @@ -118,7 +118,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, diff -Nru a/include/asm-sh/semaphore.h b/include/asm-sh/semaphore.h --- a/include/asm-sh/semaphore.h Thu Feb 27 01:44:31 2003 +++ b/include/asm-sh/semaphore.h Thu Feb 27 01:44:31 2003 @@ -54,7 +54,7 @@ * *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); * * i'd rather use the more flexible initialization above, but sadly - * GCC 2.7.2.3 emits a bogus warning. EGCS doesnt. Oh well. + * GCC 2.7.2.3 emits a bogus warning. EGCS doesn't. Oh well. */ atomic_set(&sem->count, val); sem->sleepers = 0; diff -Nru a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h --- a/include/asm-sparc/pci.h Thu Feb 27 01:44:27 2003 +++ b/include/asm-sparc/pci.h Thu Feb 27 01:44:27 2003 @@ -59,7 +59,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int direction); diff -Nru a/include/asm-sparc/uaccess.h b/include/asm-sparc/uaccess.h --- a/include/asm-sparc/uaccess.h Thu Feb 27 01:44:28 2003 +++ b/include/asm-sparc/uaccess.h Thu Feb 27 01:44:28 2003 @@ -89,7 +89,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. */ #define put_user(x,ptr) ({ \ unsigned long __pu_addr = (unsigned long)(ptr); \ diff -Nru a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h --- a/include/asm-sparc64/pbm.h Thu Feb 27 01:44:31 2003 +++ b/include/asm-sparc64/pbm.h Thu Feb 27 01:44:31 2003 @@ -59,7 +59,7 @@ unsigned long iommu_ctxflush; /* IOMMU context flush register */ /* This is a register in the PCI controller, which if - * read will have no side-effects but will guarentee + * read will have no side-effects but will guarantee * completion of all previous writes into IOMMU/STC. */ unsigned long write_complete_reg; diff -Nru a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h --- a/include/asm-sparc64/pci.h Thu Feb 27 01:44:19 2003 +++ b/include/asm-sparc64/pci.h Thu Feb 27 01:44:19 2003 @@ -67,7 +67,7 @@ * must match what was provided for in a previous pci_map_single call. All * other usages are undefined. * - * After this call, reads by the cpu to the buffer are guarenteed to see + * After this call, reads by the cpu to the buffer are guaranteed to see * whatever the device wrote there. */ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int direction); diff -Nru a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h --- a/include/asm-sparc64/rwsem.h Thu Feb 27 01:44:26 2003 +++ b/include/asm-sparc64/rwsem.h Thu Feb 27 01:44:26 2003 @@ -8,7 +8,7 @@ #define _SPARC64_RWSEM_H #ifndef _LINUX_RWSEM_H -#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead +#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #endif #ifdef __KERNEL__ diff -Nru a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h --- a/include/asm-sparc64/uaccess.h Thu Feb 27 01:44:22 2003 +++ b/include/asm-sparc64/uaccess.h Thu Feb 27 01:44:22 2003 @@ -96,7 +96,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. */ #define put_user(x,ptr) ({ \ unsigned long __pu_addr = (unsigned long)(ptr); \ diff -Nru a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h --- a/include/asm-um/pgtable.h Thu Feb 27 01:44:31 2003 +++ b/include/asm-um/pgtable.h Thu Feb 27 01:44:31 2003 @@ -226,7 +226,7 @@ } /* - * (pmds are folded into pgds so this doesnt get actually called, + * (pmds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) */ #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval) diff -Nru a/include/asm-v850/sim.h b/include/asm-v850/sim.h --- a/include/asm-v850/sim.h Thu Feb 27 01:44:20 2003 +++ b/include/asm-v850/sim.h Thu Feb 27 01:44:20 2003 @@ -22,7 +22,7 @@ #define PLATFORM_LONG "GDB V850E simulator" -/* We use a wierd value for RAM, not just 0, for testing purposes. +/* We use a weird value for RAM, not just 0, for testing purposes. These must match the values used in the linker script. */ #define RAM_ADDR 0x8F000000 #define RAM_SIZE 0x01000000 diff -Nru a/include/asm-x86_64/rwsem.h b/include/asm-x86_64/rwsem.h --- a/include/asm-x86_64/rwsem.h Thu Feb 27 01:44:27 2003 +++ b/include/asm-x86_64/rwsem.h Thu Feb 27 01:44:27 2003 @@ -34,7 +34,7 @@ #define _X8664_RWSEM_H #ifndef _LINUX_RWSEM_H -#error please dont include asm/rwsem.h directly, use linux/rwsem.h instead +#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #endif #ifdef __KERNEL__ diff -Nru a/include/asm-x86_64/semaphore.h b/include/asm-x86_64/semaphore.h --- a/include/asm-x86_64/semaphore.h Thu Feb 27 01:44:16 2003 +++ b/include/asm-x86_64/semaphore.h Thu Feb 27 01:44:16 2003 @@ -78,7 +78,7 @@ * *sem = (struct semaphore)__SEMAPHORE_INITIALIZER((*sem),val); * * i'd rather use the more flexible initialization above, but sadly - * GCC 2.7.2.3 emits a bogus warning. EGCS doesnt. Oh well. + * GCC 2.7.2.3 emits a bogus warning. EGCS doesn't. Oh well. */ atomic_set(&sem->count, val); sem->sleepers = 0; diff -Nru a/include/asm-x86_64/uaccess.h b/include/asm-x86_64/uaccess.h --- a/include/asm-x86_64/uaccess.h Thu Feb 27 01:44:20 2003 +++ b/include/asm-x86_64/uaccess.h Thu Feb 27 01:44:20 2003 @@ -79,7 +79,7 @@ * This gets kind of ugly. We want to return _two_ values in "get_user()" * and yet we don't want to do any pointers, because that is too much * of a performance impact. Thus we have a few rather ugly macros here, - * and hide all the uglyness from the user. + * and hide all the ugliness from the user. * * The "__xxx" versions of the user access functions are versions that * do not verify the address space, that must have been done previously diff -Nru a/include/linux/acpi.h b/include/linux/acpi.h --- a/include/linux/acpi.h Thu Feb 27 01:44:16 2003 +++ b/include/linux/acpi.h Thu Feb 27 01:44:16 2003 @@ -79,7 +79,7 @@ struct acpi_table_rsdt { struct acpi_table_header header; - u32 entry[1]; + u32 entry[8]; } __attribute__ ((packed)); /* Extended System Description Table (XSDT) */ diff -Nru a/include/linux/cyclades.h b/include/linux/cyclades.h --- a/include/linux/cyclades.h Thu Feb 27 01:44:31 2003 +++ b/include/linux/cyclades.h Thu Feb 27 01:44:31 2003 @@ -141,7 +141,7 @@ /****************** ****************** *******************/ /* * The data types defined below are used in all ZFIRM interface - * data structures. They accomodate differences between HW + * data structures. They accommodate differences between HW * architectures and compilers. */ diff -Nru a/include/linux/dcache.h b/include/linux/dcache.h --- a/include/linux/dcache.h Thu Feb 27 01:44:31 2003 +++ b/include/linux/dcache.h Thu Feb 27 01:44:31 2003 @@ -262,6 +262,8 @@ static __inline__ struct dentry * dget(struct dentry *dentry) { if (dentry) { + if (!atomic_read(&dentry->d_count)) + BUG(); atomic_inc(&dentry->d_count); dentry->d_vfs_flags |= DCACHE_REFERENCED; } diff -Nru a/include/linux/ethtool.h b/include/linux/ethtool.h --- a/include/linux/ethtool.h Thu Feb 27 01:44:20 2003 +++ b/include/linux/ethtool.h Thu Feb 27 01:44:20 2003 @@ -22,7 +22,7 @@ u8 duplex; /* Duplex, half or full */ u8 port; /* Which connector port */ u8 phy_address; - u8 transceiver; /* Which tranceiver to use */ + u8 transceiver; /* Which transceiver to use */ u8 autoneg; /* Enable or disable autonegotiation */ u32 maxtxpkt; /* Tx pkts before generating tx int */ u32 maxrxpkt; /* Rx pkts before generating rx int */ @@ -336,7 +336,7 @@ #define PORT_FIBRE 0x03 #define PORT_BNC 0x04 -/* Which tranceiver to use. */ +/* Which transceiver to use. */ #define XCVR_INTERNAL 0x00 #define XCVR_EXTERNAL 0x01 #define XCVR_DUMMY1 0x02 diff -Nru a/include/linux/fs.h b/include/linux/fs.h --- a/include/linux/fs.h Thu Feb 27 01:44:20 2003 +++ b/include/linux/fs.h Thu Feb 27 01:44:20 2003 @@ -743,9 +743,9 @@ int (*setattr) (struct dentry *, struct iattr *); int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *); int (*setxattr) (struct dentry *, const char *,const void *,size_t,int); - ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t,int); - ssize_t (*listxattr) (struct dentry *, char *, size_t, int); - int (*removexattr) (struct dentry *, const char *, int); + ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); + ssize_t (*listxattr) (struct dentry *, char *, size_t); + int (*removexattr) (struct dentry *, const char *); }; struct seq_file; diff -Nru a/include/linux/i2c-proc.h b/include/linux/i2c-proc.h --- a/include/linux/i2c-proc.h Thu Feb 27 01:44:24 2003 +++ b/include/linux/i2c-proc.h Thu Feb 27 01:44:24 2003 @@ -69,8 +69,7 @@ these functions must be updated! */ extern int i2c_register_entry(struct i2c_client *client, const char *prefix, - ctl_table * ctl_template, - struct module *controlling_mod); + ctl_table * ctl_template); extern void i2c_deregister_entry(int id); diff -Nru a/include/linux/if.h b/include/linux/if.h --- a/include/linux/if.h Thu Feb 27 01:44:22 2003 +++ b/include/linux/if.h Thu Feb 27 01:44:22 2003 @@ -59,7 +59,7 @@ #define IF_IFACE_X21 0x1002 /* X.21 serial interface */ #define IF_IFACE_T1 0x1003 /* T1 telco serial interface */ #define IF_IFACE_E1 0x1004 /* E1 telco serial interface */ -#define IF_IFACE_SYNC_SERIAL 0x1005 /* cant'b be set by software */ +#define IF_IFACE_SYNC_SERIAL 0x1005 /* can't be set by software */ /* For definitions see hdlc.h */ #define IF_PROTO_HDLC 0x2000 /* raw HDLC protocol */ diff -Nru a/include/linux/ipmi.h b/include/linux/ipmi.h --- a/include/linux/ipmi.h Thu Feb 27 01:44:31 2003 +++ b/include/linux/ipmi.h Thu Feb 27 01:44:31 2003 @@ -166,7 +166,7 @@ typedef struct ipmi_user *ipmi_user_t; /* - * Stuff coming from the recieve interface comes as one of these. + * Stuff coming from the receive interface comes as one of these. * They are allocated, the receiver must free them with * ipmi_free_recv_msg() when done with the message. The link is not * used after the message is delivered, so the upper layer may use the diff -Nru a/include/linux/jiffies.h b/include/linux/jiffies.h --- a/include/linux/jiffies.h Thu Feb 27 01:44:17 2003 +++ b/include/linux/jiffies.h Thu Feb 27 01:44:17 2003 @@ -28,7 +28,7 @@ * These inlines deal with timer wrapping correctly. You are * strongly encouraged to use them * 1. Because people otherwise forget - * 2. Because if the timer wrap changes in future you wont have to + * 2. Because if the timer wrap changes in future you won't have to * alter your driver code. * * time_after(a,b) returns true if the time a is after time b. diff -Nru a/include/linux/mm.h b/include/linux/mm.h --- a/include/linux/mm.h Thu Feb 27 01:44:17 2003 +++ b/include/linux/mm.h Thu Feb 27 01:44:17 2003 @@ -232,11 +232,15 @@ static inline void put_page(struct page *page) { if (PageCompound(page)) { - page = (struct page *)page->lru.next; - if (page->lru.prev) { /* destructor? */ - (*(void (*)(struct page *))page->lru.prev)(page); - return; + if (put_page_testzero(page)) { + page = (struct page *)page->lru.next; + if (page->lru.prev) { /* destructor? */ + (*(void (*)(struct page *))page->lru.prev)(page); + } else { + __page_cache_release(page); + } } + return; } if (!PageReserved(page) && put_page_testzero(page)) __page_cache_release(page); diff -Nru a/include/linux/n_r3964.h b/include/linux/n_r3964.h --- a/include/linux/n_r3964.h Thu Feb 27 01:44:27 2003 +++ b/include/linux/n_r3964.h Thu Feb 27 01:44:27 2003 @@ -165,7 +165,7 @@ { unsigned int length; /* length in chars without header */ unsigned char *data; /* usually data is located - immediatly behind this struct */ + immediately behind this struct */ unsigned int locks; /* only used in rx_buffer */ struct r3964_block_header *next; diff -Nru a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h --- a/include/linux/rwsem-spinlock.h Thu Feb 27 01:44:24 2003 +++ b/include/linux/rwsem-spinlock.h Thu Feb 27 01:44:24 2003 @@ -9,7 +9,7 @@ #define _LINUX_RWSEM_SPINLOCK_H #ifndef _LINUX_RWSEM_H -#error please dont include linux/rwsem-spinlock.h directly, use linux/rwsem.h instead +#error "please don't include linux/rwsem-spinlock.h directly, use linux/rwsem.h instead" #endif #include diff -Nru a/include/linux/sdla_x25.h b/include/linux/sdla_x25.h --- a/include/linux/sdla_x25.h Thu Feb 27 01:44:23 2003 +++ b/include/linux/sdla_x25.h Thu Feb 27 01:44:23 2003 @@ -154,7 +154,7 @@ #define X25RES_INVAL_CALL_ARG 0x3A /* errorneous call arguments */ #define X25RES_INVAL_CALL_DATA 0x3B /* errorneous call user data */ #define X25RES_ASYNC_PACKET 0x40 /* asynchronous packet received */ -#define X25RES_PROTO_VIOLATION 0x41 /* protocol violation occured */ +#define X25RES_PROTO_VIOLATION 0x41 /* protocol violation occurred */ #define X25RES_PKT_TIMEOUT 0x42 /* X.25 packet time out */ #define X25RES_PKT_RETRY_LIMIT 0x43 /* X.25 packet retry limit exceeded */ /*----- Command-dependent results -----*/ diff -Nru a/include/linux/serial.h b/include/linux/serial.h --- a/include/linux/serial.h Thu Feb 27 01:44:20 2003 +++ b/include/linux/serial.h Thu Feb 27 01:44:20 2003 @@ -91,6 +91,7 @@ #define UART_CLEAR_FIFO 0x01 #define UART_USE_FIFO 0x02 #define UART_STARTECH 0x04 +#define UART_NATSEMI 0x08 /* * Definitions for async_struct (and serial_struct) flags field diff -Nru a/include/linux/serial_core.h b/include/linux/serial_core.h --- a/include/linux/serial_core.h Thu Feb 27 01:44:18 2003 +++ b/include/linux/serial_core.h Thu Feb 27 01:44:18 2003 @@ -37,7 +37,8 @@ #define PORT_16654 11 #define PORT_16850 12 #define PORT_RSA 13 -#define PORT_MAX_8250 13 /* max port ID */ +#define PORT_NS16550A 14 +#define PORT_MAX_8250 14 /* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed @@ -172,6 +173,7 @@ #define UPF_LOW_LATENCY (1 << 13) #define UPF_BUGGY_UART (1 << 14) #define UPF_AUTOPROBE (1 << 15) +#define UPF_MAGIC_MULTIPLIER (1 << 16) #define UPF_BOOT_ONLYMCA (1 << 22) #define UPF_CONS_FLOW (1 << 23) #define UPF_SHARE_IRQ (1 << 24) @@ -179,7 +181,7 @@ #define UPF_RESOURCES (1 << 30) #define UPF_IOREMAP (1 << 31) -#define UPF_CHANGE_MASK (0x7fff) +#define UPF_CHANGE_MASK (0x17fff) #define UPF_USR_MASK (UPF_SPD_MASK|UPF_LOW_LATENCY) unsigned int mctrl; /* current modem ctrl settings */ @@ -279,12 +281,11 @@ * Baud rate helpers. */ void uart_update_timeout(struct uart_port *port, unsigned int cflag, - unsigned int quot); + unsigned int baud); unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios, struct termios *old, unsigned int min, unsigned int max); -unsigned int uart_get_divisor(struct uart_port *port, struct termios *termios, - struct termios *old_termios); +unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud); /* * Console helpers. diff -Nru a/include/linux/telephony.h b/include/linux/telephony.h --- a/include/linux/telephony.h Thu Feb 27 01:44:24 2003 +++ b/include/linux/telephony.h Thu Feb 27 01:44:24 2003 @@ -68,7 +68,7 @@ * device installed in your system. The PHONECTL_CAPABILITIES ioctl * returns an integer value indicating the number of capabilities the * device has. The PHONECTL_CAPABILITIES_LIST will fill an array of -* capability structs with all of it's capabilities. The +* capability structs with all of its capabilities. The * PHONECTL_CAPABILITIES_CHECK takes a single capability struct and returns * a TRUE if the device has that capability, otherwise it returns false. * diff -Nru a/include/linux/time.h b/include/linux/time.h --- a/include/linux/time.h Thu Feb 27 01:44:25 2003 +++ b/include/linux/time.h Thu Feb 27 01:44:25 2003 @@ -28,6 +28,12 @@ #include /* + * Have the 32 bit jiffies value wrap 5 minutes after boot + * so jiffies wrap bugs show up earlier. + */ +#define INITIAL_JIFFIES ((unsigned int) (-300*HZ)) + +/* * Change timeval to jiffies, trying to avoid the * most obvious overflows.. * diff -Nru a/include/linux/xattr.h b/include/linux/xattr.h --- a/include/linux/xattr.h Thu Feb 27 01:44:25 2003 +++ b/include/linux/xattr.h Thu Feb 27 01:44:25 2003 @@ -9,8 +9,7 @@ #ifndef _LINUX_XATTR_H #define _LINUX_XATTR_H -#define XATTR_CREATE 0x1 /* fail if attr already exists */ -#define XATTR_REPLACE 0x2 /* fail if attr does not exist */ -#define XATTR_KERNEL_CONTEXT 0x4 /* called from kernel context */ +#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ +#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ #endif /* _LINUX_XATTR_H */ diff -Nru a/include/net/dn_dev.h b/include/net/dn_dev.h --- a/include/net/dn_dev.h Thu Feb 27 01:44:17 2003 +++ b/include/net/dn_dev.h Thu Feb 27 01:44:17 2003 @@ -45,7 +45,7 @@ * device will come up. In the dn_dev structure, it is the actual * state. * - * Things have changed here. I've killed timer1 since its a user space + * Things have changed here. I've killed timer1 since it's a user space * issue for a user space routing deamon to sort out. The kernel does * not need to be bothered with it. * diff -Nru a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h --- a/include/net/irda/irda_device.h Thu Feb 27 01:44:31 2003 +++ b/include/net/irda/irda_device.h Thu Feb 27 01:44:31 2003 @@ -195,7 +195,7 @@ /* The SIR unwrapper async_unwrap_char() will use a Rx-copy-break mechanism * when using the optional ZeroCopy Rx, where only small frames are memcpy - * to a smaller skb to save memory. This is the thresold under which copy + * to a smaller skb to save memory. This is the threshold under which copy * will happen (and over which it won't happen). * Some FIR drivers may use this #define as well... * This is the same value as various Ethernet drivers. - Jean II */ diff -Nru a/include/net/irda/vlsi_ir.h b/include/net/irda/vlsi_ir.h --- a/include/net/irda/vlsi_ir.h Thu Feb 27 01:44:25 2003 +++ b/include/net/irda/vlsi_ir.h Thu Feb 27 01:44:25 2003 @@ -382,7 +382,7 @@ * PLSWID = (pulsetime * freq / (BAUD+1)) - 1 * where pulsetime is the requested IrPHY pulse width * and freq is 8(16)MHz for 40(48)MHz primary input clock - * PREAMB: dont care for SIR + * PREAMB: don't care for SIR * * The nominal SIR pulse width is 3/16 bit time so we have PLSWID=12 * fixed for all SIR speeds at 40MHz input clock (PLSWID=24 at 48MHz). @@ -401,7 +401,7 @@ * PREAMB = 1 * * FIR-mode: BAUD = 0 - * PLSWID: dont care + * PLSWID: don't care * PREAMB = 15 */ diff -Nru a/include/net/iw_handler.h b/include/net/iw_handler.h --- a/include/net/iw_handler.h Thu Feb 27 01:44:19 2003 +++ b/include/net/iw_handler.h Thu Feb 27 01:44:19 2003 @@ -92,7 +92,7 @@ * The implementation goals were as follow : * o Obvious : you should not need a PhD to understand what's happening, * the benefit is easier maintainance. - * o Flexible : it should accomodate a wide variety of driver + * o Flexible : it should accommodate a wide variety of driver * implementations and be as flexible as the old API. * o Lean : it should be efficient memory wise to minimise the impact * on kernel footprint. diff -Nru a/include/net/llc_conn.h b/include/net/llc_conn.h --- a/include/net/llc_conn.h Thu Feb 27 01:44:28 2003 +++ b/include/net/llc_conn.h Thu Feb 27 01:44:28 2003 @@ -61,7 +61,7 @@ u8 inc_cntr; u8 dec_cntr; u8 connect_step; - u8 last_nr; /* NR of last pdu recieved */ + u8 last_nr; /* NR of last pdu received */ u32 rx_pdu_hdr; /* used for saving header of last pdu received and caused sending FRMR. Used for resending FRMR */ diff -Nru a/include/net/sctp/structs.h b/include/net/sctp/structs.h --- a/include/net/sctp/structs.h Thu Feb 27 01:44:31 2003 +++ b/include/net/sctp/structs.h Thu Feb 27 01:44:31 2003 @@ -1233,7 +1233,7 @@ /* Pointer to last transport I have sent on. */ struct sctp_transport *last_sent_to; - /* This is the last transport I have recieved DATA on. */ + /* This is the last transport I have received DATA on. */ struct sctp_transport *last_data_from; /* diff -Nru a/include/net/sctp/user.h b/include/net/sctp/user.h --- a/include/net/sctp/user.h Thu Feb 27 01:44:17 2003 +++ b/include/net/sctp/user.h Thu Feb 27 01:44:17 2003 @@ -177,7 +177,7 @@ */ enum sctp_sinfo_flags { - MSG_UNORDERED = 1, /* Send/recieve message unordered. */ + MSG_UNORDERED = 1, /* Send/receive message unordered. */ MSG_ADDR_OVER = 2, /* Override the primary destination. */ MSG_ABORT=4, /* Send an ABORT message to the peer. */ /* MSG_EOF is already defined per socket.h */ diff -Nru a/include/sound/cs46xx_dsp_spos.h b/include/sound/cs46xx_dsp_spos.h --- a/include/sound/cs46xx_dsp_spos.h Thu Feb 27 01:44:24 2003 +++ b/include/sound/cs46xx_dsp_spos.h Thu Feb 27 01:44:24 2003 @@ -36,12 +36,12 @@ #define SEGTYPE_SP_COEFFICIENT 0x00000004 #define DSP_SPOS_UU 0x0deadul /* unused */ -#define DSP_SPOS_DC 0x0badul /* dont care */ -#define DSP_SPOS_DC_DC 0x0bad0badul /* dont care */ +#define DSP_SPOS_DC 0x0badul /* don't care */ +#define DSP_SPOS_DC_DC 0x0bad0badul /* don't care */ #define DSP_SPOS_UUUU 0xdeadc0edul /* unused */ #define DSP_SPOS_UUHI 0xdeadul #define DSP_SPOS_UULO 0xc0edul -#define DSP_SPOS_DCDC 0x0badf1d0ul /* dont care */ +#define DSP_SPOS_DCDC 0x0badf1d0ul /* don't care */ #define DSP_SPOS_DCDCHI 0x0badul #define DSP_SPOS_DCDCLO 0xf1d0ul diff -Nru a/include/sound/uda1341.h b/include/sound/uda1341.h --- a/include/sound/uda1341.h Thu Feb 27 01:44:26 2003 +++ b/include/sound/uda1341.h Thu Feb 27 01:44:26 2003 @@ -160,7 +160,7 @@ * this was computed as peak_value[i] = pow((63-i)*1.42,1.013) * * UDA1341 datasheet on page 21: Peak value (dB) = (Peak level - 63.5)*5*log2 - * There is an tabel with these values [level]=value: [3]=-90.31, [7]=-84.29 + * There is an table with these values [level]=value: [3]=-90.31, [7]=-84.29 * [61]=-2.78, [62] = -1.48, [63] = 0.0 * I tried to compute it, but using but even using logarithm with base either 10 or 2 * i was'n able to get values in the table from the formula. So I constructed another diff -Nru a/include/sound/wavefront.h b/include/sound/wavefront.h --- a/include/sound/wavefront.h Thu Feb 27 01:44:21 2003 +++ b/include/sound/wavefront.h Thu Feb 27 01:44:21 2003 @@ -687,7 +687,7 @@ /* Allow direct user-space control over FX memory/coefficient data. In theory this could be used to download the FX microprogram, - but it would be a little slower, and involve some wierd code. + but it would be a little slower, and involve some weird code. */ #define WFFX_MEMSET 69 diff -Nru a/init/do_mounts.c b/init/do_mounts.c --- a/init/do_mounts.c Thu Feb 27 01:44:22 2003 +++ b/init/do_mounts.c Thu Feb 27 01:44:22 2003 @@ -297,13 +297,12 @@ * Allow the user to distinguish between failed open * and bad superblock on root device. */ - printk ("VFS: Cannot open root device \"%s\" or %s\n", - root_device_name, kdevname (to_kdev_t(ROOT_DEV))); - printk ("Please append a correct \"root=\" boot option\n"); - panic("VFS: Unable to mount root fs on %s", - kdevname(to_kdev_t(ROOT_DEV))); + printk("VFS: Cannot open root device \"%s\" or %s\n", + root_device_name, __bdevname(ROOT_DEV)); + printk("Please append a correct \"root=\" boot option\n"); + panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV)); } - panic("VFS: Unable to mount root fs on %s", kdevname(to_kdev_t(ROOT_DEV))); + panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV)); out: putname(fs_names); sys_chdir("/root"); diff -Nru a/kernel/cpufreq.c b/kernel/cpufreq.c --- a/kernel/cpufreq.c Thu Feb 27 01:44:20 2003 +++ b/kernel/cpufreq.c Thu Feb 27 01:44:20 2003 @@ -1078,11 +1078,11 @@ down(&cpufreq_notifier_sem); - /* adjust if neccessary - all reasons */ + /* adjust if necessary - all reasons */ notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_ADJUST, policy); - /* adjust if neccessary - hardware incompatibility*/ + /* adjust if necessary - hardware incompatibility*/ notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_INCOMPATIBLE, policy); diff -Nru a/kernel/exit.c b/kernel/exit.c --- a/kernel/exit.c Thu Feb 27 01:44:28 2003 +++ b/kernel/exit.c Thu Feb 27 01:44:28 2003 @@ -482,7 +482,7 @@ static inline void reparent_thread(task_t *p, task_t *father, int traced) { - /* We dont want people slaying init. */ + /* We don't want people slaying init. */ if (p->exit_signal != -1) p->exit_signal = SIGCHLD; p->self_exec_id++; diff -Nru a/kernel/fork.c b/kernel/fork.c --- a/kernel/fork.c Thu Feb 27 01:44:18 2003 +++ b/kernel/fork.c Thu Feb 27 01:44:18 2003 @@ -446,7 +446,7 @@ tsk->clear_child_tid = NULL; /* - * We dont check the error code - if userspace has + * We don't check the error code - if userspace has * not set up a proper pointer then tough luck. */ put_user(0, tidptr); @@ -901,7 +901,7 @@ /* * Share the timeslice between parent and child, thus the - * total amount of pending timeslices in the system doesnt change, + * total amount of pending timeslices in the system doesn't change, * resulting in more scheduling fairness. */ local_irq_disable(); diff -Nru a/kernel/futex.c b/kernel/futex.c --- a/kernel/futex.c Thu Feb 27 01:44:20 2003 +++ b/kernel/futex.c Thu Feb 27 01:44:20 2003 @@ -39,7 +39,7 @@ /* * We use this hashed waitqueue instead of a normal wait_queue_t, so - * we can wake only the relevent ones (hashed queues may be shared): + * we can wake only the relevant ones (hashed queues may be shared): */ struct futex_q { struct list_head list; @@ -297,7 +297,7 @@ time = schedule_timeout(time); set_current_state(TASK_RUNNING); /* - * NOTE: we dont remove ourselves from the waitqueue because + * NOTE: we don't remove ourselves from the waitqueue because * we are the only user of it. */ if (time == 0) { diff -Nru a/kernel/module.c b/kernel/module.c --- a/kernel/module.c Thu Feb 27 01:44:27 2003 +++ b/kernel/module.c Thu Feb 27 01:44:27 2003 @@ -76,6 +76,22 @@ } EXPORT_SYMBOL(init_module); +/* Find a module section: 0 means not found. */ +static unsigned int find_sec(Elf_Ehdr *hdr, + Elf_Shdr *sechdrs, + const char *secstrings, + const char *name) +{ + unsigned int i; + + for (i = 1; i < hdr->e_shnum; i++) + /* Alloc bit cleared means "ignore it." */ + if ((sechdrs[i].sh_flags & SHF_ALLOC) + && strcmp(secstrings+sechdrs[i].sh_name, name) == 0) + return i; + return 0; +} + /* Find a symbol, return value and the symbol group */ static unsigned long __find_symbol(const char *name, struct kernel_symbol_group **group, @@ -173,16 +189,19 @@ struct module_use *use; if (b == NULL || already_uses(a, b)) return 1; + if (!strong_try_module_get(b)) + return 0; + DEBUGP("Allocating new usage for %s.\n", a->name); use = kmalloc(sizeof(*use), GFP_ATOMIC); if (!use) { printk("%s: out of memory loading\n", a->name); + module_put(b); return 0; } use->module_which_uses = a; list_add(&use->list, &b->modules_which_use_me); - try_module_get(b); /* Can't fail */ return 1; } @@ -875,45 +894,6 @@ } EXPORT_SYMBOL_GPL(__symbol_get); -/* Deal with the given section */ -static int handle_section(const char *name, - Elf_Shdr *sechdrs, - unsigned int strindex, - unsigned int symindex, - unsigned int i, - struct module *mod) -{ - int ret; - const char *strtab = (char *)sechdrs[strindex].sh_addr; - - switch (sechdrs[i].sh_type) { - case SHT_REL: - ret = apply_relocate(sechdrs, strtab, symindex, i, mod); - break; - case SHT_RELA: - ret = apply_relocate_add(sechdrs, strtab, symindex, i, mod); - break; - default: - DEBUGP("Ignoring section %u: %s\n", i, - sechdrs[i].sh_type==SHT_NULL ? "NULL": - sechdrs[i].sh_type==SHT_PROGBITS ? "PROGBITS": - sechdrs[i].sh_type==SHT_SYMTAB ? "SYMTAB": - sechdrs[i].sh_type==SHT_STRTAB ? "STRTAB": - sechdrs[i].sh_type==SHT_RELA ? "RELA": - sechdrs[i].sh_type==SHT_HASH ? "HASH": - sechdrs[i].sh_type==SHT_DYNAMIC ? "DYNAMIC": - sechdrs[i].sh_type==SHT_NOTE ? "NOTE": - sechdrs[i].sh_type==SHT_NOBITS ? "NOBITS": - sechdrs[i].sh_type==SHT_REL ? "REL": - sechdrs[i].sh_type==SHT_SHLIB ? "SHLIB": - sechdrs[i].sh_type==SHT_DYNSYM ? "DYNSYM": - sechdrs[i].sh_type==SHT_NUM ? "NUM": - "UNKNOWN"); - ret = 0; - } - return ret; -} - /* Change all symbols so that sh_value encodes the pointer directly. */ static int simplify_symbols(Elf_Shdr *sechdrs, unsigned int symindex, @@ -1103,93 +1083,19 @@ sechdrs = (void *)hdr + hdr->e_shoff; secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; - /* May not export symbols, or have setup params, so these may - not exist */ - exportindex = setupindex = obsparmindex = gplindex = licenseindex - = crcindex = gplcrcindex = versindex = 0; - /* And these should exist, but gcc whinges if we don't init them */ - symindex = strindex = exindex = modindex = vmagindex = 0; + symindex = strindex = 0; - /* Find where important sections are */ for (i = 1; i < hdr->e_shnum; i++) { /* Mark all sections sh_addr with their address in the temporary image. */ sechdrs[i].sh_addr = (size_t)hdr + sechdrs[i].sh_offset; + /* Internal symbols and strings. */ if (sechdrs[i].sh_type == SHT_SYMTAB) { - /* Internal symbols */ - DEBUGP("Symbol table in section %u\n", i); symindex = i; - /* Strings */ strindex = sechdrs[i].sh_link; - DEBUGP("String table found in section %u\n", strindex); - } else if (strcmp(secstrings+sechdrs[i].sh_name, - ".gnu.linkonce.this_module") == 0) { - /* The module struct */ - DEBUGP("Module in section %u\n", i); - modindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, "__ksymtab") - == 0) { - /* Exported symbols. */ - DEBUGP("EXPORT table in section %u\n", i); - exportindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, - "__ksymtab_gpl") == 0) { - /* Exported symbols. (GPL) */ - DEBUGP("GPL symbols found in section %u\n", i); - gplindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, "__kcrctab") - == 0) { - /* Exported symbols CRCs. */ - DEBUGP("CRC table in section %u\n", i); - crcindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, "__kcrctab_gpl") - == 0) { - /* Exported symbols CRCs. (GPL)*/ - DEBUGP("CRC table in section %u\n", i); - gplcrcindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, "__param") - == 0) { - /* Setup parameter info */ - DEBUGP("Setup table found in section %u\n", i); - setupindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, "__ex_table") - == 0) { - /* Exception table */ - DEBUGP("Exception table found in section %u\n", i); - exindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name, "__obsparm") - == 0) { - /* Obsolete MODULE_PARM() table */ - DEBUGP("Obsolete param found in section %u\n", i); - obsparmindex = i; - } else if (strcmp(secstrings+sechdrs[i].sh_name,".init.license") - == 0) { - /* MODULE_LICENSE() */ - DEBUGP("Licence found in section %u\n", i); - licenseindex = i; - sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC; - } else if (strcmp(secstrings+sechdrs[i].sh_name, - "__vermagic") == 0 && - (sechdrs[i].sh_flags & SHF_ALLOC)) { - /* Version magic. */ - DEBUGP("Version magic found in section %u\n", i); - vmagindex = i; - sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC; - } else if (strcmp(secstrings+sechdrs[i].sh_name, - "__versions") == 0 && - (sechdrs[i].sh_flags & SHF_ALLOC)) { - /* Module version info (both exported and needed) */ - DEBUGP("Versions found in section %u\n", i); - versindex = i; - sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC; } -#ifdef CONFIG_KALLSYMS - /* symbol and string tables for decoding later. */ - if (sechdrs[i].sh_type == SHT_SYMTAB || i == strindex) - sechdrs[i].sh_flags |= SHF_ALLOC; -#endif #ifndef CONFIG_MODULE_UNLOAD /* Don't load .exit sections */ if (strstr(secstrings+sechdrs[i].sh_name, ".exit")) @@ -1197,6 +1103,14 @@ #endif } +#ifdef CONFIG_KALLSYMS + /* Keep symbol and string tables for decoding later. */ + sechdrs[symindex].sh_flags |= SHF_ALLOC; + sechdrs[strindex].sh_flags |= SHF_ALLOC; +#endif + + modindex = find_sec(hdr, sechdrs, secstrings, + ".gnu.linkonce.this_module"); if (!modindex) { printk(KERN_WARNING "No module found in object\n"); err = -ENOEXEC; @@ -1204,6 +1118,18 @@ } mod = (void *)sechdrs[modindex].sh_addr; + /* Optional sections */ + exportindex = find_sec(hdr, sechdrs, secstrings, "__ksymtab"); + gplindex = find_sec(hdr, sechdrs, secstrings, "__ksymtab_gpl"); + crcindex = find_sec(hdr, sechdrs, secstrings, "__kcrctab"); + gplcrcindex = find_sec(hdr, sechdrs, secstrings, "__kcrctab_gpl"); + setupindex = find_sec(hdr, sechdrs, secstrings, "__param"); + exindex = find_sec(hdr, sechdrs, secstrings, "__ex_table"); + obsparmindex = find_sec(hdr, sechdrs, secstrings, "__obsparm"); + licenseindex = find_sec(hdr, sechdrs, secstrings, ".init.license"); + vmagindex = find_sec(hdr, sechdrs, secstrings, "__vermagic"); + versindex = find_sec(hdr, sechdrs, secstrings, "__versions"); + /* Check module struct version now, before we try to use module. */ if (!check_modstruct_version(sechdrs, versindex, mod)) { err = -ENOEXEC; @@ -1336,10 +1262,15 @@ mod->extable.entry = (void *)sechdrs[exindex].sh_addr; } - /* Now handle each section. */ + /* Now do relocations. */ for (i = 1; i < hdr->e_shnum; i++) { - err = handle_section(secstrings + sechdrs[i].sh_name, - sechdrs, strindex, symindex, i, mod); + const char *strtab = (char *)sechdrs[strindex].sh_addr; + if (sechdrs[i].sh_type == SHT_REL) + err = apply_relocate(sechdrs, strtab, symindex, i, + mod); + else if (sechdrs[i].sh_type == SHT_RELA) + err = apply_relocate_add(sechdrs, strtab, symindex, i, + mod); if (err < 0) goto cleanup; } @@ -1456,10 +1387,12 @@ } /* Now it's a first class citizen! */ + down(&module_mutex); mod->state = MODULE_STATE_LIVE; module_free(mod, mod->module_init); mod->module_init = NULL; mod->init_size = 0; + up(&module_mutex); return 0; } diff -Nru a/kernel/pm.c b/kernel/pm.c --- a/kernel/pm.c Thu Feb 27 01:44:19 2003 +++ b/kernel/pm.c Thu Feb 27 01:44:19 2003 @@ -141,11 +141,11 @@ * data field must hold the intended next state. No call is made * if the state matches. * - * BUGS: what stops two power management requests occuring in parallel + * BUGS: what stops two power management requests occurring in parallel * and conflicting. * * WARNING: Calling pm_send directly is not generally recommended, in - * paticular there is no locking against the pm_dev going away. The + * particular there is no locking against the pm_dev going away. The * caller must maintain all needed locking or have 'inside knowledge' * on the safety. Also remember that this function is not locked against * pm_unregister. This means that you must handle SMP races on callback @@ -227,7 +227,7 @@ * Zero is returned on success. If a suspend fails then the status * from the device that vetoes the suspend is returned. * - * BUGS: what stops two power management requests occuring in parallel + * BUGS: what stops two power management requests occurring in parallel * and conflicting. */ diff -Nru a/kernel/suspend.c b/kernel/suspend.c --- a/kernel/suspend.c Thu Feb 27 01:44:20 2003 +++ b/kernel/suspend.c Thu Feb 27 01:44:20 2003 @@ -604,12 +604,12 @@ static int prepare_suspend_processes(void) { + sys_sync(); /* Syncing needs pdflushd, so do it before stopping processes */ if (freeze_processes()) { printk( KERN_ERR "Suspend failed: Not all processes stopped!\n" ); thaw_processes(); return 1; } - sys_sync(); return 0; } @@ -961,7 +961,7 @@ printk("Relocating pagedir"); if(!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) { - printk("not neccessary\n"); + printk("not necessary\n"); return 0; } diff -Nru a/kernel/sys.c b/kernel/sys.c --- a/kernel/sys.c Thu Feb 27 01:44:18 2003 +++ b/kernel/sys.c Thu Feb 27 01:44:18 2003 @@ -870,7 +870,7 @@ if (copy_to_user(tbuf, &tmp, sizeof(struct tms))) return -EFAULT; } - return jiffies_to_clock_t(jiffies); + return (long) jiffies_64_to_clock_t(get_jiffies_64()); } /* diff -Nru a/kernel/timer.c b/kernel/timer.c --- a/kernel/timer.c Thu Feb 27 01:44:27 2003 +++ b/kernel/timer.c Thu Feb 27 01:44:27 2003 @@ -757,7 +757,7 @@ } /* jiffies at the most recent update of wall time */ -unsigned long wall_jiffies; +unsigned long wall_jiffies = INITIAL_JIFFIES; /* * This read-write spinlock protects us from races in SMP while @@ -1104,7 +1104,7 @@ do { seq = read_seqbegin(&xtime_lock); - uptime = jiffies_64; + uptime = jiffies_64 - INITIAL_JIFFIES; do_div(uptime, HZ); val.uptime = (unsigned long) uptime; @@ -1180,6 +1180,13 @@ } for (j = 0; j < TVR_SIZE; j++) INIT_LIST_HEAD(base->tv1.vec + j); + + base->timer_jiffies = INITIAL_JIFFIES; + base->tv1.index = INITIAL_JIFFIES & TVR_MASK; + base->tv2.index = (INITIAL_JIFFIES >> TVR_BITS) & TVN_MASK; + base->tv3.index = (INITIAL_JIFFIES >> (TVR_BITS+TVN_BITS)) & TVN_MASK; + base->tv4.index = (INITIAL_JIFFIES >> (TVR_BITS+2*TVN_BITS)) & TVN_MASK; + base->tv5.index = (INITIAL_JIFFIES >> (TVR_BITS+3*TVN_BITS)) & TVN_MASK; } static int __devinit timer_cpu_notify(struct notifier_block *self, diff -Nru a/lib/crc32.c b/lib/crc32.c --- a/lib/crc32.c Thu Feb 27 01:44:17 2003 +++ b/lib/crc32.c Thu Feb 27 01:44:17 2003 @@ -90,19 +90,16 @@ const u32 *tab = crc32table_le; # ifdef __LITTLE_ENDIAN -# define DO_CRC crc = (crc>>8) ^ tab[ crc & 255 ] -# define ENDIAN_SHIFT 0 +# define DO_CRC(x) crc = tab[ (crc ^ (x)) & 255 ] ^ (crc>>8) # else -# define DO_CRC crc = (crc<<8) ^ tab[ crc >> 24 ] -# define ENDIAN_SHIFT 24 +# define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8) # endif crc = __cpu_to_le32(crc); /* Align it */ if(unlikely(((long)b)&3 && len)){ do { - crc ^= *((u8 *)b)++ << ENDIAN_SHIFT; - DO_CRC; + DO_CRC(*((u8 *)b)++); } while ((--len) && ((long)b)&3 ); } if(likely(len >= 4)){ @@ -112,10 +109,10 @@ --b; /* use pre increment below(*++b) for speed */ do { crc ^= *++b; - DO_CRC; - DO_CRC; - DO_CRC; - DO_CRC; + DO_CRC(0); + DO_CRC(0); + DO_CRC(0); + DO_CRC(0); } while (--len); b++; /* point to next byte(s) */ len = save_len; @@ -123,8 +120,7 @@ /* And the last few bytes */ if(len){ do { - crc ^= *((u8 *)b)++ << ENDIAN_SHIFT; - DO_CRC; + DO_CRC(*((u8 *)b)++); } while (--len); } @@ -195,19 +191,16 @@ const u32 *tab = crc32table_be; # ifdef __LITTLE_ENDIAN -# define DO_CRC crc = (crc>>8) ^ tab[ crc & 255 ] -# define ENDIAN_SHIFT 24 +# define DO_CRC(x) crc = tab[ (crc ^ (x)) & 255 ] ^ (crc>>8) # else -# define DO_CRC crc = (crc<<8) ^ tab[ crc >> 24 ] -# define ENDIAN_SHIFT 0 +# define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8) # endif crc = __cpu_to_be32(crc); /* Align it */ if(unlikely(((long)b)&3 && len)){ do { - crc ^= *((u8 *)b)++ << ENDIAN_SHIFT; - DO_CRC; + DO_CRC(*((u8 *)b)++); } while ((--len) && ((long)b)&3 ); } if(likely(len >= 4)){ @@ -217,10 +210,10 @@ --b; /* use pre increment below(*++b) for speed */ do { crc ^= *++b; - DO_CRC; - DO_CRC; - DO_CRC; - DO_CRC; + DO_CRC(0); + DO_CRC(0); + DO_CRC(0); + DO_CRC(0); } while (--len); b++; /* point to next byte(s) */ len = save_len; @@ -228,8 +221,7 @@ /* And the last few bytes */ if(len){ do { - crc ^= *((u8 *)b)++ << ENDIAN_SHIFT; - DO_CRC; + DO_CRC(*((u8 *)b)++); } while (--len); } return __be32_to_cpu(crc); diff -Nru a/lib/crc32defs.h b/lib/crc32defs.h --- a/lib/crc32defs.h Thu Feb 27 01:44:17 2003 +++ b/lib/crc32defs.h Thu Feb 27 01:44:17 2003 @@ -8,8 +8,12 @@ /* How many bits at a time to use. Requires a table of 4<page_lock); - page = radix_tree_lookup(&mapping->page_tree, index); - if (!page) { - read_unlock(&mapping->page_lock); - handle_ra_miss(mapping,ra); + page = find_get_page(mapping, index); + if (unlikely(page == NULL)) { + handle_ra_miss(mapping, ra); goto no_cached_page; } - page_cache_get(page); - read_unlock(&mapping->page_lock); - if (!PageUptodate(page)) goto page_not_up_to_date; page_ok: diff -Nru a/mm/memory.c b/mm/memory.c --- a/mm/memory.c Thu Feb 27 01:44:22 2003 +++ b/mm/memory.c Thu Feb 27 01:44:22 2003 @@ -158,9 +158,7 @@ pmd_populate(mm, pmd, new); } out: - if (pmd_present(*pmd)) - return pte_offset_map(pmd, address); - return NULL; + return pte_offset_map(pmd, address); } pte_t * pte_alloc_kernel(struct mm_struct *mm, pmd_t *pmd, unsigned long address) diff -Nru a/mm/oom_kill.c b/mm/oom_kill.c --- a/mm/oom_kill.c Thu Feb 27 01:44:23 2003 +++ b/mm/oom_kill.c Thu Feb 27 01:44:23 2003 @@ -61,6 +61,9 @@ if (!p->mm) return 0; + + if (p->flags & PF_MEMDIE) + return 0; /* * The memory size of the process is the basis for the badness. */ diff -Nru a/mm/pdflush.c b/mm/pdflush.c --- a/mm/pdflush.c Thu Feb 27 01:44:31 2003 +++ b/mm/pdflush.c Thu Feb 27 01:44:31 2003 @@ -103,9 +103,11 @@ my_work->when_i_went_to_sleep = jiffies; spin_unlock_irq(&pdflush_lock); - if (current->flags & PF_FREEZE) - refrigerator(PF_IOTHREAD); schedule(); + if (current->flags & PF_FREEZE) { + refrigerator(PF_IOTHREAD); + continue; + } spin_lock_irq(&pdflush_lock); if (!list_empty(&my_work->list)) { diff -Nru a/mm/slab.c b/mm/slab.c --- a/mm/slab.c Thu Feb 27 01:44:27 2003 +++ b/mm/slab.c Thu Feb 27 01:44:27 2003 @@ -1643,7 +1643,7 @@ if (cachep->ctor && cachep->flags & SLAB_POISON) { unsigned long ctor_flags = SLAB_CTOR_CONSTRUCTOR; - if (!flags & __GFP_WAIT) + if (!(flags & __GFP_WAIT)) ctor_flags |= SLAB_CTOR_ATOMIC; cachep->ctor(objp, cachep, ctor_flags); @@ -2064,7 +2064,7 @@ else limit = 248; -#ifndef DEBUG +#if DEBUG /* With debugging enabled, large batchcount lead to excessively * long periods with disabled local interrupts. Limit the * batchcount diff -Nru a/mm/swap.c b/mm/swap.c --- a/mm/swap.c Thu Feb 27 01:44:22 2003 +++ b/mm/swap.c Thu Feb 27 01:44:22 2003 @@ -27,7 +27,7 @@ int page_cluster; /* - * Writeback is about to end against a page whic has been marked for immediate + * Writeback is about to end against a page which has been marked for immediate * reclaim. If it still appears to be reclaimable, move it to the tail of the * inactive list. The page still has PageWriteback set, which will pin it. * diff -Nru a/net/8021q/vlan.h b/net/8021q/vlan.h --- a/net/8021q/vlan.h Thu Feb 27 01:44:25 2003 +++ b/net/8021q/vlan.h Thu Feb 27 01:44:25 2003 @@ -38,7 +38,7 @@ extern struct vlan_group *vlan_group_hash[VLAN_GRP_HASH_SIZE]; extern spinlock_t vlan_group_lock; -/* Find a VLAN device by the MAC address of it's Ethernet device, and +/* Find a VLAN device by the MAC address of its Ethernet device, and * it's VLAN ID. The default configuration is to have VLAN's scope * to be box-wide, so the MAC will be ignored. The mac will only be * looked at if we are configured to have a separate set of VLANs per diff -Nru a/net/core/Makefile b/net/core/Makefile --- a/net/core/Makefile Thu Feb 27 01:44:30 2003 +++ b/net/core/Makefile Thu Feb 27 01:44:30 2003 @@ -19,5 +19,3 @@ obj-$(CONFIG_NET_PROFILE) += profile.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o obj-$(CONFIG_NET_RADIO) += wireless.o -# Ugly. I wish all wireless drivers were moved in drivers/net/wireless -obj-$(CONFIG_NET_PCMCIA_RADIO) += wireless.o diff -Nru a/net/core/dev.c b/net/core/dev.c --- a/net/core/dev.c Thu Feb 27 01:44:23 2003 +++ b/net/core/dev.c Thu Feb 27 01:44:23 2003 @@ -107,10 +107,10 @@ #include #include #include -#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO) +#ifdef CONFIG_NET_RADIO #include /* Note : will define WIRELESS_EXT */ #include -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ #ifdef CONFIG_PLIP extern int plip_init(void); #endif @@ -1215,7 +1215,7 @@ #ifdef OFFLINE_SAMPLE static void sample_queue(unsigned long dummy) { -/* 10 ms 0r 1ms -- i dont care -- JHS */ +/* 10 ms 0r 1ms -- i don't care -- JHS */ int next_tick = 1; int cpu = smp_processor_id(); diff -Nru a/net/core/netfilter.c b/net/core/netfilter.c --- a/net/core/netfilter.c Thu Feb 27 01:44:22 2003 +++ b/net/core/netfilter.c Thu Feb 27 01:44:23 2003 @@ -606,7 +606,7 @@ struct net_device *dev_src = NULL; int err; - /* accomodate ip_route_output_slow(), which expects the key src to be + /* accommodate ip_route_output_slow(), which expects the key src to be 0 or a local address; however some non-standard hacks like ipt_REJECT.c:send_reset() can cause packets with foreign saddr to be appear on the NF_IP_LOCAL_OUT hook -MB */ diff -Nru a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c --- a/net/decnet/dn_dev.c Thu Feb 27 01:44:21 2003 +++ b/net/decnet/dn_dev.c Thu Feb 27 01:44:21 2003 @@ -18,7 +18,7 @@ * Steve Whitehouse : Multiple ifaddr support * Steve Whitehouse : SIOCGIFCONF is now a compile time option * Steve Whitehouse : /proc/sys/net/decnet/conf//forwarding - * Steve Whitehouse : Removed timer1 - its a user space issue now + * Steve Whitehouse : Removed timer1 - it's a user space issue now * Patrick Caulfield : Fixed router hello message format */ @@ -807,7 +807,7 @@ * This is one of those areas where the initial VMS concepts don't really * map onto the Linux concepts, and since we introduced multiple addresses * per interface we have to cope with slightly odd ways of finding out what - * "our address" really is. Mostly its not a problem; for this we just guess + * "our address" really is. Mostly it's not a problem; for this we just guess * a sensible default. Eventually the routing code will take care of all the * nasties for us I hope. */ diff -Nru a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c Thu Feb 27 01:44:16 2003 +++ b/net/ipv4/netfilter/ip_conntrack_core.c Thu Feb 27 01:44:16 2003 @@ -702,7 +702,7 @@ if (!expected) conntrack->helper = ip_ct_find_helper(&repl_tuple); - /* If the expectation is dying, then this is a looser. */ + /* If the expectation is dying, then this is a loser. */ if (expected && expected->expectant->helper->timeout && ! del_timer(&expected->timeout)) diff -Nru a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c --- a/net/ipv4/netfilter/ip_conntrack_ftp.c Thu Feb 27 01:44:27 2003 +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c Thu Feb 27 01:44:27 2003 @@ -321,7 +321,7 @@ if (found == -1) { /* We don't usually drop packets. After all, this is connection tracking, not packet filtering. - However, it is neccessary for accurate tracking in + However, it is necessary for accurate tracking in this case. */ if (net_ratelimit()) printk("conntrack_ftp: partial %s %u+%u\n", diff -Nru a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c --- a/net/ipv4/netfilter/ip_conntrack_irc.c Thu Feb 27 01:44:27 2003 +++ b/net/ipv4/netfilter/ip_conntrack_irc.c Thu Feb 27 01:44:27 2003 @@ -107,7 +107,7 @@ static int help(const struct iphdr *iph, size_t len, struct ip_conntrack *ct, enum ip_conntrack_info ctinfo) { - /* tcplen not negative guarenteed by ip_conntrack_tcp.c */ + /* tcplen not negative guaranteed by ip_conntrack_tcp.c */ struct tcphdr *tcph = (void *) iph + iph->ihl * 4; const char *data = (const char *) tcph + tcph->doff * 4; const char *_data = data; @@ -199,7 +199,7 @@ LOCK_BH(&ip_irc_lock); /* save position of address in dcc string, - * neccessary for NAT */ + * necessary for NAT */ DEBUGP("tcph->seq = %u\n", tcph->seq); exp->seq = ntohl(tcph->seq) + (addr_beg_p - _data); exp_irc_info->len = (addr_end_p - addr_beg_p); diff -Nru a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c --- a/net/ipv4/netfilter/ip_nat_core.c Thu Feb 27 01:44:19 2003 +++ b/net/ipv4/netfilter/ip_nat_core.c Thu Feb 27 01:44:19 2003 @@ -288,7 +288,7 @@ saved_ip = tuple->src.ip; other_ipp = &tuple->src.ip; } - /* Don't do do_extra_mangle unless neccessary (overrides + /* Don't do do_extra_mangle unless necessary (overrides explicit socket bindings, for example) */ orig_dstip = tuple->dst.ip; diff -Nru a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c --- a/net/ipv4/netfilter/ip_nat_irc.c Thu Feb 27 01:44:31 2003 +++ b/net/ipv4/netfilter/ip_nat_irc.c Thu Feb 27 01:44:31 2003 @@ -188,7 +188,7 @@ datalen = (*pskb)->len - iph->ihl * 4 - tcph->doff * 4; LOCK_BH(&ip_irc_lock); - /* Check wether the whole IP/address pattern is carried in the payload */ + /* Check whether the whole IP/address pattern is carried in the payload */ if (between(exp->seq + ct_irc_info->len, ntohl(tcph->seq), ntohl(tcph->seq) + datalen)) { diff -Nru a/net/ipv4/tcp.c b/net/ipv4/tcp.c --- a/net/ipv4/tcp.c Thu Feb 27 01:44:21 2003 +++ b/net/ipv4/tcp.c Thu Feb 27 01:44:21 2003 @@ -172,7 +172,7 @@ * ack if state is TCP_CLOSED. * Alan Cox : Look up device on a retransmit - routes may * change. Doesn't yet cope with MSS shrink right - * but its a start! + * but it's a start! * Marc Tamsky : Closing in closing fixes. * Mike Shaver : RFC1122 verifications. * Alan Cox : rcv_saddr errors. diff -Nru a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c --- a/net/ipv6/ndisc.c Thu Feb 27 01:44:25 2003 +++ b/net/ipv6/ndisc.c Thu Feb 27 01:44:25 2003 @@ -208,7 +208,7 @@ default: /* * Unknown options must be silently ignored, - * to accomodate future extension to the protocol. + * to accommodate future extension to the protocol. */ ND_PRINTK2(KERN_WARNING "ndisc_parse_options(): ignored unsupported option; type=%d, len=%d\n", diff -Nru a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c --- a/net/ipx/af_ipx.c Thu Feb 27 01:44:19 2003 +++ b/net/ipx/af_ipx.c Thu Feb 27 01:44:19 2003 @@ -684,7 +684,7 @@ if (ipx->ipx_source.net != intrfc->if_netnum) { /* * Unshare the buffer before modifying the count in - * case its a flood or tcpdump + * case it's a flood or tcpdump */ skb = skb_unshare(skb, GFP_ATOMIC); if (!skb) diff -Nru a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c --- a/net/irda/irlmp_event.c Thu Feb 27 01:44:20 2003 +++ b/net/irda/irlmp_event.c Thu Feb 27 01:44:20 2003 @@ -423,7 +423,7 @@ /* We don't want to change state just yet, because * we want to reflect accurately the real state of * the LAP, not the state we wish it was in, - * so that we don't loose LM_LAP_CONNECT_REQUEST. + * so that we don't lose LM_LAP_CONNECT_REQUEST. * In some cases, IrLAP won't close the LAP * immediately. For example, it might still be * retrying packets or waiting for the pf bit. diff -Nru a/net/irda/irsyms.c b/net/irda/irsyms.c --- a/net/irda/irsyms.c Thu Feb 27 01:44:30 2003 +++ b/net/irda/irsyms.c Thu Feb 27 01:44:30 2003 @@ -254,7 +254,7 @@ /* * Function irda_init (void) * - * Protocol stack intialisation entry point. + * Protocol stack initialisation entry point. * Initialise the various components of the IrDA stack */ int __init irda_init(void) diff -Nru a/net/irda/irttp.c b/net/irda/irttp.c --- a/net/irda/irttp.c Thu Feb 27 01:44:25 2003 +++ b/net/irda/irttp.c Thu Feb 27 01:44:25 2003 @@ -710,7 +710,7 @@ * The current skb has a reference to the socket that sent * it (skb->sk). When we pass it to IrLMP, the skb will be * stored in in IrLAP (self->wx_list). When we are within - * IrLAP, we loose the notion of socket, so we should not + * IrLAP, we lose the notion of socket, so we should not * have a reference to a socket. So, we drop it here. * * Why does it matter ? diff -Nru a/net/llc/af_llc.c b/net/llc/af_llc.c --- a/net/llc/af_llc.c Thu Feb 27 01:44:17 2003 +++ b/net/llc/af_llc.c Thu Feb 27 01:44:17 2003 @@ -301,7 +301,7 @@ llc->daddr.lsap = addr->sllc_dsap; memcpy(llc->daddr.mac, addr->sllc_dmac, IFHWADDRLEN); memcpy(&llc->addr, addr, sizeof(llc->addr)); - /* assign new connection to it's SAP */ + /* assign new connection to its SAP */ llc_sap_assign_sock(sap, sk); rc = sk->zapped = 0; out: diff -Nru a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c --- a/net/llc/llc_pdu.c Thu Feb 27 01:44:19 2003 +++ b/net/llc/llc_pdu.c Thu Feb 27 01:44:19 2003 @@ -203,7 +203,7 @@ xid_info = (struct llc_xid_info *)(((u8 *)&pdu->ctrl_1) + 1); xid_info->fmt_id = LLC_XID_FMT_ID; /* 0x81 */ xid_info->type = svcs_supported; - xid_info->rw = rx_window << 1; /* size of recieve window */ + xid_info->rw = rx_window << 1; /* size of receive window */ skb_put(skb, 3); } diff -Nru a/net/netsyms.c b/net/netsyms.c --- a/net/netsyms.c Thu Feb 27 01:44:22 2003 +++ b/net/netsyms.c Thu Feb 27 01:44:22 2003 @@ -646,12 +646,12 @@ EXPORT_SYMBOL(softnet_data); -#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO) +#ifdef CONFIG_NET_RADIO /* Don't include the whole header mess for a single function */ union iwreq_data; extern void wireless_send_event(struct net_device *dev, unsigned int cmd, union iwreq_data *wrqu, char *extra); EXPORT_SYMBOL(wireless_send_event); -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ EXPORT_SYMBOL(linkwatch_fire_event); diff -Nru a/net/sched/sch_gred.c b/net/sched/sch_gred.c --- a/net/sched/sch_gred.c Thu Feb 27 01:44:28 2003 +++ b/net/sched/sch_gred.c Thu Feb 27 01:44:28 2003 @@ -416,7 +416,7 @@ memcpy(q->Stab, RTA_DATA(tb[TCA_GRED_STAB-1]), 256); if ( table->initd && table->grio) { - /* this looks ugly but its not in the fast path */ + /* this looks ugly but it's not in the fast path */ for (i=0;iDPs;i++) { if ((!table->tab[i]) || (i==q->DP) ) continue; diff -Nru a/net/sched/sch_htb.c b/net/sched/sch_htb.c --- a/net/sched/sch_htb.c Thu Feb 27 01:44:25 2003 +++ b/net/sched/sch_htb.c Thu Feb 27 01:44:25 2003 @@ -623,7 +623,7 @@ if (new_mode == cl->cmode) return; - if (cl->prio_activity) { /* not neccessary: speed optimization */ + if (cl->prio_activity) { /* not necessary: speed optimization */ if (cl->cmode != HTB_CANT_SEND) htb_deactivate_prios(q,cl); cl->cmode = new_mode; diff -Nru a/net/sctp/outqueue.c b/net/sctp/outqueue.c --- a/net/sctp/outqueue.c Thu Feb 27 01:44:21 2003 +++ b/net/sctp/outqueue.c Thu Feb 27 01:44:21 2003 @@ -423,7 +423,7 @@ *start_timer = 1; /* Stop sending DATA as there is no more room - * at the reciever. + * at the receiver. */ list_add(lchunk, lqueue); lchunk = NULL; diff -Nru a/net/sctp/primitive.c b/net/sctp/primitive.c --- a/net/sctp/primitive.c Thu Feb 27 01:44:31 2003 +++ b/net/sctp/primitive.c Thu Feb 27 01:44:31 2003 @@ -199,7 +199,7 @@ * o association id - local handle to the SCTP association * * o destination transport address - the transport address of the - * asociation on which a heartbeat should be issued. + * association on which a heartbeat should be issued. */ DECLARE_PRIMITIVE(REQUESTHEARTBEAT); diff -Nru a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c --- a/net/sctp/sm_statefuns.c Thu Feb 27 01:44:18 2003 +++ b/net/sctp/sm_statefuns.c Thu Feb 27 01:44:18 2003 @@ -939,7 +939,7 @@ return 0; } -/* A restart is occuring, check to make sure no new addresses +/* A restart is occurring, check to make sure no new addresses * are being added as we may be under a takeover attack. */ static int sctp_sf_check_restart_addrs(const sctp_association_t *new_asoc, @@ -1413,7 +1413,7 @@ * at about the same time but the peer endpoint started its INIT * after responding to the local endpoint's INIT */ -/* This case represents an intialization collision. */ +/* This case represents an initialization collision. */ static sctp_disposition_t sctp_sf_do_dupcook_b(const sctp_endpoint_t *ep, const sctp_association_t *asoc, sctp_chunk_t *chunk, @@ -3734,7 +3734,7 @@ * o association id - local handle to the SCTP association * * o destination transport address - the transport address of the - * asociation on which a heartbeat should be issued. + * association on which a heartbeat should be issued. */ sctp_disposition_t sctp_sf_do_prm_requestheartbeat( const sctp_endpoint_t *ep, diff -Nru a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c --- a/net/sctp/ulpevent.c Thu Feb 27 01:44:19 2003 +++ b/net/sctp/ulpevent.c Thu Feb 27 01:44:19 2003 @@ -785,7 +785,7 @@ sctp_association_put(asoc); } -/* Charge receive window for bytes recieved. */ +/* Charge receive window for bytes received. */ static void sctp_ulpevent_set_owner_r(struct sk_buff *skb, sctp_association_t *asoc) { sctp_ulpevent_t *event; diff -Nru a/net/socket.c b/net/socket.c --- a/net/socket.c Thu Feb 27 01:44:22 2003 +++ b/net/socket.c Thu Feb 27 01:44:22 2003 @@ -83,9 +83,9 @@ #include #endif -#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO) +#ifdef CONFIG_NET_RADIO #include /* Note : will define WIRELESS_EXT */ -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ #include diff -Nru a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c --- a/net/sunrpc/auth_unix.c Thu Feb 27 01:44:24 2003 +++ b/net/sunrpc/auth_unix.c Thu Feb 27 01:44:24 2003 @@ -163,7 +163,7 @@ memcpy(p, clnt->cl_nodename, n); p += (n + 3) >> 2; - /* Note: we don't use real uid if it involves raising priviledge */ + /* Note: we don't use real uid if it involves raising privilege */ if (ruid && cred->uc_puid != 0 && cred->uc_pgid != 0) { *p++ = htonl((u32) cred->uc_puid); *p++ = htonl((u32) cred->uc_pgid); diff -Nru a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c --- a/net/wanrouter/af_wanpipe.c Thu Feb 27 01:44:30 2003 +++ b/net/wanrouter/af_wanpipe.c Thu Feb 27 01:44:30 2003 @@ -388,7 +388,7 @@ /* Register the lcn on which incoming call came * from. Thus, if we have to clear it, we know - * whic lcn to clear + * which lcn to clear */ newwp->lcn = mbox_ptr->cmd.lcn; @@ -674,7 +674,7 @@ /*============================================================ * wanpipe_delayed_tarnsmit * - * Transmit bottom half handeler. It dequeues packets + * Transmit bottom half handler. It dequeues packets * from sk->write_queue and passes them to the * driver. If the driver is busy, the packet is * re-enqueued. diff -Nru a/scripts/README.Menuconfig b/scripts/README.Menuconfig --- a/scripts/README.Menuconfig Thu Feb 27 01:44:22 2003 +++ b/scripts/README.Menuconfig Thu Feb 27 01:44:22 2003 @@ -127,7 +127,7 @@ source tree is fresh, or changes are patched into it via a kernel patch or you do 'make mrproper'. If changes to lxdialog are patched in, most likely the rebuild time will be short. You may force a -complete rebuild of lxdialog by changing to it's directory and doing +complete rebuild of lxdialog by changing to its directory and doing 'make clean all' If you use Menuconfig in an XTERM window make sure you have your diff -Nru a/scripts/mkspec b/scripts/mkspec --- a/scripts/mkspec Thu Feb 27 01:44:17 2003 +++ b/scripts/mkspec Thu Feb 27 01:44:17 2003 @@ -45,24 +45,18 @@ echo "%setup -q" echo "" echo "%build" -# This is the first 'disagreement' between x86 and other archs. -if [ $PC = 1 ]; then - echo "make oldconfig dep clean bzImage modules" -else - echo "make oldconfig dep clean vmlinux modules" -fi -# Back on track +echo "make clean oldconfig all" echo "" echo "%install" echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules' echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install' -# And that's the second +# This is the first disagreement between i386 and most others if [ $PC = 1 ]; then echo 'cp arch/i386/boot/bzImage $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" else echo 'cp vmlinux $RPM_BUILD_ROOT'"/boot/vmlinux-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" fi -# Back on track, again +# Back on track echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo "" diff -Nru a/sound/core/device.c b/sound/core/device.c --- a/sound/core/device.c Thu Feb 27 01:44:25 2003 +++ b/sound/core/device.c Thu Feb 27 01:44:25 2003 @@ -144,7 +144,7 @@ * Registers the device which was already created via * snd_device_new(). Usually this is called from snd_card_register(), * but it can be called later if any new devices are created after - * invokation of snd_card_register(). + * invocation of snd_card_register(). * * Returns zero if successful, or a negative error code on failure or if the * device not found. diff -Nru a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c --- a/sound/core/seq/seq_midi_emul.c Thu Feb 27 01:44:30 2003 +++ b/sound/core/seq/seq_midi_emul.c Thu Feb 27 01:44:30 2003 @@ -375,7 +375,7 @@ /* - * intialize the MIDI status + * initialize the MIDI status */ void snd_midi_channel_set_clear(snd_midi_channel_set_t *chset) diff -Nru a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c --- a/sound/core/seq/seq_timer.c Thu Feb 27 01:44:27 2003 +++ b/sound/core/seq/seq_timer.c Thu Feb 27 01:44:27 2003 @@ -401,7 +401,7 @@ return cur_time; } -/* TODO: use interpolation on tick queue (will only be usefull for very +/* TODO: use interpolation on tick queue (will only be useful for very high PPQ values) */ snd_seq_tick_time_t snd_seq_timer_get_cur_tick(seq_timer_t *tmr) { diff -Nru a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c --- a/sound/drivers/mtpav.c Thu Feb 27 01:44:27 2003 +++ b/sound/drivers/mtpav.c Thu Feb 27 01:44:27 2003 @@ -102,7 +102,7 @@ /* * defines */ -//#define USE_FAKE_MTP // dont actually read/write to MTP device (for debugging without an actual unit) (does not work yet) +//#define USE_FAKE_MTP // don't actually read/write to MTP device (for debugging without an actual unit) (does not work yet) // parallel port usage masks #define SIGS_BYTE 0x08 @@ -763,7 +763,7 @@ if (err < 0) goto __error; - err = snd_card_register(mtp_card->card); // dont snd_card_register until AFTER all cards reources done! + err = snd_card_register(mtp_card->card); // don't snd_card_register until AFTER all cards reources done! //printk("snd_card_register returned %d\n", err); if (err < 0) diff -Nru a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c --- a/sound/i2c/l3/uda1341.c Thu Feb 27 01:44:23 2003 +++ b/sound/i2c/l3/uda1341.c Thu Feb 27 01:44:23 2003 @@ -494,7 +494,7 @@ DEBUG_NAME(KERN_DEBUG "info_enum where: %d\n", where); - // this register we dont handle this way + // this register we don't handle this way if (!uda1341_enum_items[where]) return -EINVAL; diff -Nru a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c --- a/sound/isa/wavefront/wavefront_fx.c Thu Feb 27 01:44:25 2003 +++ b/sound/isa/wavefront/wavefront_fx.c Thu Feb 27 01:44:25 2003 @@ -227,7 +227,7 @@ This code was developed using DOSEMU. The Turtle Beach SETUPSND utility was run with I/O tracing in DOSEMU enabled, and a reconstruction of the port I/O done, using the Yamaha faxback document as a guide - to add more logic to the code. Its really pretty wierd. + to add more logic to the code. Its really pretty weird. There was an alternative approach of just dumping the whole I/O sequence as a series of port/value pairs and a simple loop @@ -692,7 +692,7 @@ return (0); } -/* wierd stuff, derived from port I/O tracing with dosemu */ +/* weird stuff, derived from port I/O tracing with dosemu */ static unsigned char page_zero[] __initdata = { 0x01, 0x7c, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0x00, diff -Nru a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c --- a/sound/isa/wavefront/wavefront_synth.c Thu Feb 27 01:44:22 2003 +++ b/sound/isa/wavefront/wavefront_synth.c Thu Feb 27 01:44:22 2003 @@ -518,7 +518,7 @@ /*********************************************************************** WaveFront data munging -Things here are wierd. All data written to the board cannot +Things here are weird. All data written to the board cannot have its most significant bit set. Any data item with values potentially > 0x7F (127) must be split across multiple bytes. @@ -527,7 +527,7 @@ that is represented on the x86 side as an array of bytes. The most efficient approach to handling both cases seems to be to use 2 different functions for munging and 2 for de-munging. This avoids -wierd casting and worrying about bit-level offsets. +weird casting and worrying about bit-level offsets. **********************************************************************/ @@ -906,7 +906,7 @@ if (header->size) { - /* XXX its a debatable point whether or not RDONLY semantics + /* XXX it's a debatable point whether or not RDONLY semantics on the ROM samples should cover just the sample data or the sample header. For now, it only covers the sample data, so anyone is free at all times to rewrite sample headers. @@ -1034,7 +1034,7 @@ shptr = munge_int32 (*((u32 *) &header->hdr.s.sampleEndOffset), shptr, 4); - /* This one is truly wierd. What kind of wierdo decided that in + /* This one is truly weird. What kind of weirdo decided that in a system dominated by 16 and 32 bit integers, they would use a just 12 bits ? */ diff -Nru a/sound/oss/ad1816.c b/sound/oss/ad1816.c --- a/sound/oss/ad1816.c Thu Feb 27 01:44:30 2003 +++ b/sound/oss/ad1816.c Thu Feb 27 01:44:30 2003 @@ -1227,7 +1227,7 @@ sound_free_dma(devc->dma_capture); } - /* card wont get added if resources could not be allocated + /* card won't get added if resources could not be allocated thus we need not ckeck if allocation was successful */ sound_free_dma (devc->dma_playback); free_irq(devc->irq, devc->osp); diff -Nru a/sound/oss/awe_wave.c b/sound/oss/awe_wave.c --- a/sound/oss/awe_wave.c Thu Feb 27 01:44:22 2003 +++ b/sound/oss/awe_wave.c Thu Feb 27 01:44:22 2003 @@ -562,7 +562,7 @@ /* clear all samples */ awe_reset_samples(); - /* intialize AWE32 hardware */ + /* initialize AWE32 hardware */ awe_initialize(); sprintf(awe_info.name, "AWE32-%s (RAM%dk)", diff -Nru a/sound/oss/cs4232.c b/sound/oss/cs4232.c --- a/sound/oss/cs4232.c Thu Feb 27 01:44:24 2003 +++ b/sound/oss/cs4232.c Thu Feb 27 01:44:24 2003 @@ -127,7 +127,7 @@ * method conflicts with possible PnP support in the OS. For this reason * driver is just a temporary kludge. * - * Also the Cirrus/Crystal method doesnt always work. Try ISA PnP first ;) + * Also the Cirrus/Crystal method doesn't always work. Try ISA PnP first ;) */ /* diff -Nru a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c --- a/sound/oss/cs46xx.c Thu Feb 27 01:44:17 2003 +++ b/sound/oss/cs46xx.c Thu Feb 27 01:44:17 2003 @@ -1016,7 +1016,7 @@ } /* - * ganularity is byte boundry, good part. + * ganularity is byte boundary, good part. */ if(dmabuf->enable & DAC_RUNNING) { diff -Nru a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c --- a/sound/oss/dmasound/dmasound_awacs.c Thu Feb 27 01:44:21 2003 +++ b/sound/oss/dmasound/dmasound_awacs.c Thu Feb 27 01:44:21 2003 @@ -1354,7 +1354,7 @@ case AWACS_DACA: wait_ms(10); /* Check this !!! */ daca_leave_sleep(); - break ; /* dont know how yet */ + break ; /* don't know how yet */ case AWACS_BURGUNDY: break ; case AWACS_SCREAMER: @@ -2960,7 +2960,7 @@ request_module("i2c-keywest"); #endif /* CONFIG_KMOD */ daca_init(); - break ; /* dont know how yet */ + break ; /* don't know how yet */ case AWACS_BURGUNDY: awacs_burgundy_init(); break ; diff -Nru a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c --- a/sound/oss/dmasound/dmasound_core.c Thu Feb 27 01:44:19 2003 +++ b/sound/oss/dmasound/dmasound_core.c Thu Feb 27 01:44:19 2003 @@ -1212,7 +1212,7 @@ return result ; break ; case SNDCTL_DSP_SPEED: - /* changing this on the fly will have wierd effects on the sound. + /* changing this on the fly will have weird effects on the sound. Where there are rate conversions implemented in soft form - it will cause the _ctx_xxx() functions to be substituted. However, there doesn't appear to be any reason to dis-allow it from diff -Nru a/sound/oss/es1371.c b/sound/oss/es1371.c --- a/sound/oss/es1371.c Thu Feb 27 01:44:27 2003 +++ b/sound/oss/es1371.c Thu Feb 27 01:44:27 2003 @@ -73,7 +73,7 @@ * detect the ES1373 and later parts. * added AC97 #defines for readability * added a /proc file system for dumping hardware state - * updated SRC and CODEC w/r functions to accomodate bugs + * updated SRC and CODEC w/r functions to accommodate bugs * in some versions of the ES137x chips. * 31.08.1999 0.17 add spin_lock_init * replaced current->state = x with set_current_state(x) @@ -2863,7 +2863,7 @@ if ((res=(s->dev_midi = register_sound_midi(&es1371_midi_fops, -1))<0 )) goto err_dev4; #ifdef ES1371_DEBUG - /* intialize the debug proc device */ + /* initialize the debug proc device */ s->ps = create_proc_read_entry("es1371",0,NULL,proc_es1371_dump,NULL); #endif /* ES1371_DEBUG */ diff -Nru a/sound/oss/ite8172.c b/sound/oss/ite8172.c --- a/sound/oss/ite8172.c Thu Feb 27 01:44:20 2003 +++ b/sound/oss/ite8172.c Thu Feb 27 01:44:20 2003 @@ -1780,7 +1780,7 @@ goto err_dev2; #ifdef IT8172_DEBUG - /* intialize the debug proc device */ + /* initialize the debug proc device */ s->ps = create_proc_read_entry(IT8172_MODULE_NAME, 0, NULL, proc_it8172_dump, NULL); #endif /* IT8172_DEBUG */ diff -Nru a/sound/oss/maestro.c b/sound/oss/maestro.c --- a/sound/oss/maestro.c Thu Feb 27 01:44:28 2003 +++ b/sound/oss/maestro.c Thu Feb 27 01:44:28 2003 @@ -252,7 +252,7 @@ /* we try to setup 2^(dsps_order) /dev/dsp devices */ static int dsps_order=0; -/* wether or not we mess around with power management */ +/* whether or not we mess around with power management */ static int use_pm=2; /* set to 1 for force */ /* clocking for broken hardware - a few laptops seem to use a 50Khz clock ie insmod with clocking=50000 or so */ @@ -292,7 +292,7 @@ /* changed so that I could actually find all the - references and fix them up. its a little more readable now. */ + references and fix them up. it's a little more readable now. */ #define ESS_FMT_STEREO 0x01 #define ESS_FMT_16BIT 0x02 #define ESS_FMT_MASK 0x03 @@ -804,7 +804,7 @@ if (read) return val; - /* oss can have many inputs, maestro cant. try + /* oss can have many inputs, maestro can't. try to pick the 'new' one */ if (mask != val) mask &= ~val; @@ -1518,7 +1518,7 @@ pa = virt_to_bus(buffer); } else { /* right channel records its split half. - *2 accomodates for rampant shifting earlier */ + *2 accommodates for rampant shifting earlier */ pa = virt_to_bus(buffer + size*2); } @@ -3271,7 +3271,7 @@ outb(0x88, iobase+0x1f); /* it appears some maestros (dell 7500) only work if these are set, - regardless of wether we use the assp or not. */ + regardless of whether we use the assp or not. */ outb(0, iobase+0xA4); outb(3, iobase+0xA2); @@ -3507,7 +3507,7 @@ * or * - we're not a 2e, lesser chipps seem to have problems. * - we're not on our _very_ small whitelist. some implemenetations - * really dont' like the pm code, others require it. + * really don't like the pm code, others require it. * feel free to expand this as required. */ #define SUBSYSTEM_VENDOR(x) (x&0xffff) diff -Nru a/sound/oss/maestro3.c b/sound/oss/maestro3.c --- a/sound/oss/maestro3.c Thu Feb 27 01:44:29 2003 +++ b/sound/oss/maestro3.c Thu Feb 27 01:44:29 2003 @@ -1916,8 +1916,8 @@ * the amazingly complicated prog_dmabuf wants it. * * pci_alloc_sonsistent guarantees that it won't cross a natural - * boundry; the m3 hardware can't have dma cross a 64k bus - * address boundry. + * boundary; the m3 hardware can't have dma cross a 64k bus + * address boundary. */ for (order = 16-PAGE_SHIFT; order >= 1; order--) { db->rawbuf = pci_alloc_consistent(pci_dev, PAGE_SIZE << order, diff -Nru a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c --- a/sound/oss/nec_vrc5477.c Thu Feb 27 01:44:27 2003 +++ b/sound/oss/nec_vrc5477.c Thu Feb 27 01:44:27 2003 @@ -1884,7 +1884,7 @@ goto err_dev2; #ifdef VRC5477_AC97_DEBUG - /* intialize the debug proc device */ + /* initialize the debug proc device */ s->ps = create_proc_read_entry(VRC5477_AC97_MODULE_NAME, 0, NULL, proc_vrc5477_ac97_dump, NULL); #endif /* VRC5477_AC97_DEBUG */ diff -Nru a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c --- a/sound/oss/opl3sa2.c Thu Feb 27 01:44:16 2003 +++ b/sound/oss/opl3sa2.c Thu Feb 27 01:44:16 2003 @@ -918,7 +918,7 @@ break; } - /* its supposed to automute before suspending, so we wont bother */ + /* its supposed to automute before suspending, so we won't bother */ opl3sa2_read(p->cfg_port, OPL3SA2_PM, &p->reg); opl3sa2_write(p->cfg_port, OPL3SA2_PM, p->reg | pm_mode); diff -Nru a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c --- a/sound/oss/rme96xx.c Thu Feb 27 01:44:22 2003 +++ b/sound/oss/rme96xx.c Thu Feb 27 01:44:22 2003 @@ -1332,7 +1332,7 @@ file->f_flags |= O_NONBLOCK; return 0; - case SNDCTL_DSP_GETODELAY: /* What shold this exactly do ? , + case SNDCTL_DSP_GETODELAY: /* What should this exactly do ? , ATM it is just abinfo.bytes */ if (!(file->f_mode & FMODE_WRITE)) return -EINVAL; diff -Nru a/sound/oss/trident.c b/sound/oss/trident.c --- a/sound/oss/trident.c Thu Feb 27 01:44:27 2003 +++ b/sound/oss/trident.c Thu Feb 27 01:44:27 2003 @@ -19,6 +19,7 @@ * Ching-Ling Lee ALi 5451 Audio Core Support * Matt Wu ALi 5451 Audio Core Support * Peter Wächtler CyberPro5050 support + * Muli Ben-Yehuda * * * This program is free software; you can redistribute it and/or modify @@ -81,7 +82,7 @@ * v0.14.9a * Aug 6 2001 Alan Cox * 0.14.9 crashed on rmmod due to a timer/bh left running. Simplified - * the existing logic (the BH doesnt help as ac97 is lock_irqsave) + * the existing logic (the BH doesn't help as ac97 is lock_irqsave) * and used del_timer_sync to clean up * Fixed a problem where the ALi change broke my generic card * v0.14.9 @@ -201,6 +202,7 @@ #include #include #include +#include #include #include #include @@ -538,8 +540,8 @@ outl(global_control, TRID_REG(card, T4D_LFO_GC_CIR)); - TRDBG("trident: Enable Loop Interrupts, globctl = 0x%08X\n", - inl(TRID_REG(card, T4D_LFO_GC_CIR))); + pr_debug("trident: Enable Loop Interrupts, globctl = 0x%08X\n", + inl(TRID_REG(card, T4D_LFO_GC_CIR))); return (TRUE); } @@ -552,8 +554,8 @@ global_control &= ~(ENDLP_IE | MIDLP_IE); outl(global_control, TRID_REG(card, T4D_LFO_GC_CIR)); - TRDBG("trident: Disabled Loop Interrupts, globctl = 0x%08X\n", - global_control); + pr_debug("trident: Disabled Loop Interrupts, globctl = 0x%08X\n", + global_control); return (TRUE); } @@ -570,8 +572,8 @@ #ifdef DEBUG reg = inl(TRID_REG(card, addr)); - TRDBG("trident: enabled IRQ on channel %d, %s = 0x%08x(addr:%X)\n", - channel, addr==T4D_AINTEN_B? "AINTEN_B":"AINTEN_A",reg,addr); + pr_debug("trident: enabled IRQ on channel %d, %s = 0x%08x(addr:%X)\n", + channel, addr==T4D_AINTEN_B? "AINTEN_B":"AINTEN_A",reg,addr); #endif /* DEBUG */ } @@ -590,8 +592,8 @@ #ifdef DEBUG reg = inl(TRID_REG(card, addr)); - TRDBG("trident: disabled IRQ on channel %d, %s = 0x%08x(addr:%X)\n", - channel, addr==T4D_AINTEN_B? "AINTEN_B":"AINTEN_A",reg,addr); + pr_debug("trident: disabled IRQ on channel %d, %s = 0x%08x(addr:%X)\n", + channel, addr==T4D_AINTEN_B? "AINTEN_B":"AINTEN_A",reg,addr); #endif /* DEBUG */ } @@ -609,8 +611,8 @@ #ifdef DEBUG reg = inl(TRID_REG(card, addr)); - TRDBG("trident: start voice on channel %d, %s = 0x%08x(addr:%X)\n", - channel, addr==T4D_START_B? "START_B":"START_A",reg,addr); + pr_debug("trident: start voice on channel %d, %s = 0x%08x(addr:%X)\n", + channel, addr==T4D_START_B? "START_B":"START_A",reg,addr); #endif /* DEBUG */ } @@ -628,8 +630,8 @@ #ifdef DEBUG reg = inl(TRID_REG(card, addr)); - TRDBG("trident: stop voice on channel %d, %s = 0x%08x(addr:%X)\n", - channel, addr==T4D_STOP_B? "STOP_B":"STOP_A",reg,addr); + pr_debug("trident: stop voice on channel %d, %s = 0x%08x(addr:%X)\n", + channel, addr==T4D_STOP_B? "STOP_B":"STOP_A",reg,addr); #endif /* DEBUG */ } @@ -647,8 +649,8 @@ #ifdef DEBUG if (reg & mask) - TRDBG("trident: channel %d has interrupt, %s = 0x%08x\n", - channel,reg==T4D_AINT_B? "AINT_B":"AINT_A", reg); + pr_debug("trident: channel %d has interrupt, %s = 0x%08x\n", + channel,reg==T4D_AINT_B? "AINT_B":"AINT_A", reg); #endif /* DEBUG */ return (reg & mask) ? TRUE : FALSE; } @@ -665,8 +667,8 @@ #ifdef DEBUG reg = inl(TRID_REG(card, T4D_AINT_B)); - TRDBG("trident: Ack channel %d interrupt, AINT_B = 0x%08x\n", - channel, reg); + pr_debug("trident: Ack channel %d interrupt, AINT_B = 0x%08x\n", + channel, reg); #endif /* DEBUG */ } @@ -914,7 +916,7 @@ trident_write_voice_regs(state); - TRDBG("trident: called trident_set_dac_rate : rate = %d\n", rate); + pr_debug("trident: called trident_set_dac_rate : rate = %d\n", rate); return rate; } @@ -934,7 +936,7 @@ trident_write_voice_regs(state); - TRDBG("trident: called trident_set_adc_rate : rate = %d\n", rate); + pr_debug("trident: called trident_set_adc_rate : rate = %d\n", rate); return rate; } @@ -978,9 +980,9 @@ /* stereo */ channel->control |= CHANNEL_STEREO; - TRDBG("trident: trident_play_setup, LBA = 0x%08x, " - "Delta = 0x%08x, ESO = 0x%08x, Control = 0x%08x\n", - channel->lba, channel->delta, channel->eso, channel->control); + pr_debug("trident: trident_play_setup, LBA = 0x%08x, " + "Delta = 0x%08x, ESO = 0x%08x, Control = 0x%08x\n", + channel->lba, channel->delta, channel->eso, channel->control); trident_write_voice_regs(state); } @@ -1064,9 +1066,9 @@ /* stereo */ channel->control |= CHANNEL_STEREO; - TRDBG("trident: trident_rec_setup, LBA = 0x%08x, " - "Delat = 0x%08x, ESO = 0x%08x, Control = 0x%08x\n", - channel->lba, channel->delta, channel->eso, channel->control); + pr_debug("trident: trident_rec_setup, LBA = 0x%08x, " + "Delta = 0x%08x, ESO = 0x%08x, Control = 0x%08x\n", + channel->lba, channel->delta, channel->eso, channel->control); trident_write_voice_regs(state); } @@ -1101,8 +1103,8 @@ } - TRDBG("trident: trident_get_dma_addr: chip reported channel: %d, " - "cso = 0x%04x\n", dmabuf->channel->num, cso); + pr_debug("trident: trident_get_dma_addr: chip reported channel: %d, " + "cso = 0x%04x\n", dmabuf->channel->num, cso); /* ESO and CSO are in units of Samples, convert to byte offset */ cso <<= sample_shift[dmabuf->fmt]; @@ -1211,8 +1213,8 @@ &dmabuf->dma_handle))) return -ENOMEM; - TRDBG("trident: allocated %ld (order = %d) bytes at %p\n", - PAGE_SIZE << order, order, rawbuf); + pr_debug("trident: allocated %ld (order = %d) bytes at %p\n", + PAGE_SIZE << order, order, rawbuf); dmabuf->ready = dmabuf->mapped = 0; dmabuf->rawbuf = rawbuf; @@ -1349,10 +1351,11 @@ /* set the ready flag for the dma buffer */ dmabuf->ready = 1; - TRDBG("trident: prog_dmabuf(%d), sample rate = %d, format = %d, numfrag = %d, " - "fragsize = %d dmasize = %d\n", - dmabuf->channel->num, dmabuf->rate, dmabuf->fmt, dmabuf->numfrag, - dmabuf->fragsize, dmabuf->dmasize); + pr_debug("trident: prog_dmabuf(%d), sample rate = %d, " + "format = %d, numfrag = %d, fragsize = %d " + "dmasize = %d\n", dmabuf->channel->num, dmabuf->rate, + dmabuf->fmt, dmabuf->numfrag, dmabuf->fragsize, + dmabuf->dmasize); } unlock_set_fmt(state); return 0; @@ -1704,7 +1707,7 @@ /* FIXED: read interrupt status only once */ irq_status=inl(TRID_REG(card, T4D_AINT_A) ); - TRDBG("cyber_address_interrupt: irq_status 0x%X\n",irq_status); + pr_debug("cyber_address_interrupt: irq_status 0x%X\n",irq_status); for (i = 0; i < NR_HW_CH; i++) { channel = 31 - i; @@ -1712,7 +1715,7 @@ /* clear bit by writing a 1, zeroes are ignored */ outl( (1 << channel), TRID_REG(card, T4D_AINT_A)); - TRDBG("cyber_interrupt: channel %d\n", channel); + pr_debug("cyber_interrupt: channel %d\n", channel); if ((state = card->states[i]) != NULL) { trident_update_ptr(state); @@ -1735,7 +1738,7 @@ spin_lock(&card->lock); event = inl(TRID_REG(card, T4D_MISCINT)); - TRDBG("trident: trident_interrupt called, MISCINT = 0x%08x\n", event); + pr_debug("trident: trident_interrupt called, MISCINT = 0x%08x\n", event); if (event & ADDRESS_IRQ) { card->address_interrupt(card); @@ -1773,7 +1776,7 @@ unsigned swptr; int cnt; - TRDBG("trident: trident_read called, count = %d\n", count); + pr_debug("trident: trident_read called, count = %d\n", count); VALIDATE_STATE(state); if (ppos != &file->f_pos) @@ -1827,7 +1830,7 @@ which results in a (potential) buffer overrun. And worse, there is NOTHING we can do to prevent it. */ if (!interruptible_sleep_on_timeout(&dmabuf->wait, tmo)) { - TRDBG(KERN_ERR "trident: recording schedule timeout, " + pr_debug(KERN_ERR "trident: recording schedule timeout, " "dmasz %u fragsz %u count %i hwptr %u swptr %u\n", dmabuf->dmasize, dmabuf->fragsize, dmabuf->count, dmabuf->hwptr, dmabuf->swptr); @@ -1885,7 +1888,7 @@ unsigned int state_cnt; unsigned int copy_count; - TRDBG("trident: trident_write called, count = %d\n", count); + pr_debug("trident: trident_write called, count = %d\n", count); VALIDATE_STATE(state); if (ppos != &file->f_pos) @@ -1954,7 +1957,7 @@ which results in a (potential) buffer underrun. And worse, there is NOTHING we can do to prevent it. */ if (!interruptible_sleep_on_timeout(&dmabuf->wait, tmo)) { - TRDBG(KERN_ERR "trident: playback schedule timeout, " + pr_debug(KERN_ERR "trident: playback schedule timeout, " "dmasz %u fragsz %u count %i hwptr %u swptr %u\n", dmabuf->dmasize, dmabuf->fragsize, dmabuf->count, dmabuf->hwptr, dmabuf->swptr); @@ -2137,7 +2140,7 @@ VALIDATE_STATE(state); mapped = ((file->f_mode & FMODE_WRITE) && dmabuf->mapped) || ((file->f_mode & FMODE_READ) && dmabuf->mapped); - TRDBG("trident: trident_ioctl, command = %2d, arg = 0x%08x\n", + pr_debug("trident: trident_ioctl, command = %2d, arg = 0x%08x\n", _IOC_NR(cmd), arg ? *(int *)arg : 0); switch (cmd) @@ -2702,7 +2705,7 @@ state->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE); up(&card->open_sem); - TRDBG("trident: open virtual channel %d, hard channel %d\n", + pr_debug("trident: open virtual channel %d, hard channel %d\n", state->virt, dmabuf->channel->num); return 0; @@ -2724,7 +2727,7 @@ drain_dac(state, file->f_flags & O_NONBLOCK); } - TRDBG("trident: closing virtual channel %d, hard channel %d\n", + pr_debug("trident: closing virtual channel %d, hard channel %d\n", state->virt, dmabuf->channel->num); /* stop DMA state machine and free DMA buffers/channels */ @@ -2923,7 +2926,7 @@ } if(!block) { - TRDBG("accesscodecsemaphore: try unlock\n"); + pr_debug("accesscodecsemaphore: try unlock\n"); block = 1; goto unlock; } @@ -3002,7 +3005,7 @@ if(ncount <=0) break; if(ncount--==1) { - TRDBG("ali_ac97_read :try clear busy flag\n"); + pr_debug("ali_ac97_read :try clear busy flag\n"); aud_reg = inl(TRID_REG(card, ALI_AC97_WRITE)); outl((aud_reg & 0xffff7fff), TRID_REG(card, ALI_AC97_WRITE)); } @@ -3061,7 +3064,7 @@ if(ncount <= 0) break; if(ncount-- == 1) { - TRDBG("ali_ac97_set :try clear busy flag!!\n"); + pr_debug("ali_ac97_set :try clear busy flag!!\n"); outw(wcontrol & 0x7fff, TRID_REG(card, ALI_AC97_WRITE)); } udelay(10); @@ -3933,8 +3936,10 @@ udelay(5000); } - printk(KERN_ERR "ALi 5451 did not come out of reset.\n"); - return 1; + /* This is non fatal if you have a non PM capable codec.. */ + printk(KERN_ERR "ALi 5451 did not come out of reset " + "- continuing anyway.\n"); + return 0; } /* AC97 codec initialisation. */ diff -Nru a/sound/oss/trident.h b/sound/oss/trident.h --- a/sound/oss/trident.h Thu Feb 27 01:44:16 2003 +++ b/sound/oss/trident.h Thu Feb 27 01:44:16 2003 @@ -360,16 +360,4 @@ return r; } -#ifdef DEBUG - -#define TRDBG(msg, args...) do { \ - printk(KERN_DEBUG msg , ##args ); \ -} while (0) - -#else /* !defined(DEBUG) */ - -#define TRDBG(msg, args...) do { } while (0) - -#endif /* DEBUG */ - #endif /* __TRID4DWAVE_H */ diff -Nru a/sound/oss/wavfront.c b/sound/oss/wavfront.c --- a/sound/oss/wavfront.c Thu Feb 27 01:44:24 2003 +++ b/sound/oss/wavfront.c Thu Feb 27 01:44:24 2003 @@ -95,7 +95,7 @@ I consider /dev/sequencer to be an anachronism, but given its widespread usage by various Linux MIDI software, it seems worth - offering support to it if its not too painful. Instead of using + offering support to it if it's not too painful. Instead of using /dev/sequencer, I recommend: for synth programming and patch loading: /dev/synthNN @@ -1041,7 +1041,7 @@ if (header->size) { - /* XXX its a debatable point whether or not RDONLY semantics + /* XXX it's a debatable point whether or not RDONLY semantics on the ROM samples should cover just the sample data or the sample header. For now, it only covers the sample data, so anyone is free at all times to rewrite sample headers. diff -Nru a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c --- a/sound/pci/ali5451/ali5451.c Thu Feb 27 01:44:30 2003 +++ b/sound/pci/ali5451/ali5451.c Thu Feb 27 01:44:30 2003 @@ -966,7 +966,7 @@ pchregs = &(codec->chregs); - // check if interrupt occured for channel + // check if interrupt occurred for channel old = pchregs->data.aint; mask = ((unsigned int) 1L) << (channel & 0x1f); diff -Nru a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c --- a/sound/pci/cs46xx/cs46xx_lib.c Thu Feb 27 01:44:18 2003 +++ b/sound/pci/cs46xx/cs46xx_lib.c Thu Feb 27 01:44:18 2003 @@ -24,7 +24,7 @@ * * FINALLY: A credit to the developers Tom and Jordan * at Cirrus for have helping me out with the DSP, however we - * still dont have sufficient documentation and technical + * still don't have sufficient documentation and technical * references to be able to implement all fancy feutures * supported by the cs46xx DSP's. * Benny @@ -2401,7 +2401,7 @@ schedule_timeout(HZ/100); } while (time_after_eq(end_time, jiffies)); - snd_printk("CS46xx secondary codec dont respond!\n"); + snd_printk("CS46xx secondary codec don't respond!\n"); } #endif diff -Nru a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c --- a/sound/pci/cs46xx/dsp_spos_scb_lib.c Thu Feb 27 01:44:30 2003 +++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c Thu Feb 27 01:44:30 2003 @@ -181,7 +181,7 @@ (ins->scbs + scb->index) == scb), return ); #if 0 - /* cant remove a SCB with childs before + /* can't remove a SCB with childs before removing childs first */ snd_assert ( (scb->sub_list_ptr == ins->the_null_scb && scb->next_scb_ptr == ins->the_null_scb), @@ -1540,7 +1540,7 @@ cs46xx_dsp_enable_spdif_hw (chip); } - /* dont touch anything if SPDIF is open */ + /* don't touch anything if SPDIF is open */ if ( ins->spdif_status_out & DSP_SPDIF_STATUS_PLAYBACK_OPEN) { /* when cs46xx_iec958_post_close(...) is called it will call this function if necessary depending on @@ -1584,7 +1584,7 @@ { dsp_spos_instance_t * ins = chip->dsp_spos_instance; - /* dont touch anything if SPDIF is open */ + /* don't touch anything if SPDIF is open */ if ( ins->spdif_status_out & DSP_SPDIF_STATUS_PLAYBACK_OPEN) { ins->spdif_status_out &= ~DSP_SPDIF_STATUS_OUTPUT_ENABLED; return -EBUSY; diff -Nru a/sound/pci/ens1370.c b/sound/pci/ens1370.c --- a/sound/pci/ens1370.c Thu Feb 27 01:44:27 2003 +++ b/sound/pci/ens1370.c Thu Feb 27 01:44:27 2003 @@ -161,7 +161,7 @@ #define ES_1370_CSTAT (1<<10) /* CODEC is busy or register write in progress */ #define ES_1370_CBUSY (1<<9) /* CODEC is busy */ #define ES_1370_CWRIP (1<<8) /* CODEC register write in progress */ -#define ES_1371_SYNC_ERR (1<<8) /* CODEC synchronization error occured */ +#define ES_1371_SYNC_ERR (1<<8) /* CODEC synchronization error occurred */ #define ES_1371_VC(i) (((i)>>6)&0x03) /* voice code from CCB module */ #define ES_1370_VC(i) (((i)>>5)&0x03) /* voice code from CCB module */ #define ES_1371_MPWR (1<<5) /* power level interrupt pending */ @@ -172,8 +172,8 @@ #define ES_ADC (1<<0) /* ADC channel interrupt pending */ #define ES_REG_UART_DATA 0x08 /* R/W: UART data register */ #define ES_REG_UART_STATUS 0x09 /* R/O: UART status register */ -#define ES_RXINT (1<<7) /* RX interrupt occured */ -#define ES_TXINT (1<<2) /* TX interrupt occured */ +#define ES_RXINT (1<<7) /* RX interrupt occurred */ +#define ES_TXINT (1<<2) /* TX interrupt occurred */ #define ES_TXRDY (1<<1) /* transmitter ready */ #define ES_RXRDY (1<<0) /* receiver ready */ #define ES_REG_UART_CONTROL 0x09 /* W/O: UART control register */ diff -Nru a/sound/pci/es1968.c b/sound/pci/es1968.c --- a/sound/pci/es1968.c Thu Feb 27 01:44:26 2003 +++ b/sound/pci/es1968.c Thu Feb 27 01:44:26 2003 @@ -2329,7 +2329,7 @@ outb(0x88, iobase+0x1f); /* it appears some maestros (dell 7500) only work if these are set, - regardless of wether we use the assp or not. */ + regardless of whether we use the assp or not. */ outb(0, iobase + ASSP_CONTROL_B); outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ diff -Nru a/sound/sound_core.c b/sound/sound_core.c --- a/sound/sound_core.c Thu Feb 27 01:44:30 2003 +++ b/sound/sound_core.c Thu Feb 27 01:44:30 2003 @@ -14,7 +14,7 @@ * -------------------- * * Top level handler for the sound subsystem. Various devices can - * plug into this. The fact they dont all go via OSS doesn't mean + * plug into this. The fact they don't all go via OSS doesn't mean * they don't have to implement the OSS API. There is a lot of logic * to keeping much of the OSS weight out of the code in a compatibility * module, but it's up to the driver to rember to load it... diff -Nru a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c --- a/sound/usb/usbaudio.c Thu Feb 27 01:44:27 2003 +++ b/sound/usb/usbaudio.c Thu Feb 27 01:44:27 2003 @@ -1717,7 +1717,7 @@ /* - * intialize the substream instance. + * initialize the substream instance. */ static void init_substream(snd_usb_stream_t *as, int stream, struct audioformat *fp)