From 41d650100b116483dab1a88c271415096a4ba157 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Mon, 24 Feb 2003 03:57:21 -0800 Subject: [PATCH] Spelling fixes - occurring This fixes: occuring -> occurring Fixes 29 occurrences in all. --- kernel/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel') diff --git a/kernel/pm.c b/kernel/pm.c index a710764606ba..703467c33802 100644 --- a/kernel/pm.c +++ b/kernel/pm.c @@ -141,7 +141,7 @@ void pm_unregister_all(pm_callback callback) * 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 @@ -227,7 +227,7 @@ static void pm_undo_all(struct pm_dev *last) * 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. */ -- cgit v1.2.3 From bfc2b3aa6634326a9dae42b862b2587cd79cd5c1 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Mon, 24 Feb 2003 03:58:06 -0800 Subject: [PATCH] Spelling fixes - necessary This fixes: neccessary -> necessary unneccessary -> unnecessary Fixes 46 occurrences in all. --- arch/i386/kernel/cpu/cpufreq/longrun.c | 2 +- arch/i386/kernel/suspend.c | 2 +- arch/mips/au1000/common/serial.c | 2 +- arch/sh/kernel/pci-dma.c | 2 +- arch/sh/stboards/pcidma.c | 2 +- drivers/char/ftape/zftape/zftape-write.c | 2 +- drivers/ide/ide-dma.c | 8 ++++---- drivers/ide/ide-io.c | 4 ++-- drivers/ide/setup-pci.c | 4 ++-- drivers/isdn/hisax/amd7930_fn.c | 2 +- drivers/isdn/hisax/enternow_pci.c | 2 +- drivers/isdn/hysdn/hycapi.c | 2 +- drivers/md/dm-table.c | 2 +- drivers/message/i2o/i2o_core.c | 2 +- drivers/net/3c527.c | 2 +- drivers/net/8390.c | 2 +- drivers/net/e100/e100_config.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/sk98lin/h/skdrv1st.h | 2 +- drivers/net/sk98lin/h/skdrv2nd.h | 2 +- drivers/net/sk98lin/skgehwt.c | 4 ++-- drivers/net/sk98lin/ski2c.c | 2 +- drivers/net/sk98lin/skxmac2.c | 2 +- drivers/s390/block/dasd_3990_erp.c | 2 +- drivers/scsi/FlashPoint.c | 2 +- drivers/scsi/oktagon_esp.c | 2 +- drivers/serial/8250.c | 2 +- drivers/usb/serial/kobil_sct.c | 2 +- fs/reiserfs/lbalance.c | 2 +- include/asm-arm/arch-sa1100/simpad.h | 2 +- include/asm-m68k/page.h | 2 +- include/asm-s390/types.h | 2 +- include/asm-s390x/types.h | 2 +- kernel/cpufreq.c | 4 ++-- kernel/suspend.c | 2 +- net/ipv4/netfilter/ip_conntrack_ftp.c | 2 +- net/ipv4/netfilter/ip_conntrack_irc.c | 2 +- net/ipv4/netfilter/ip_nat_core.c | 2 +- net/sched/sch_htb.c | 2 +- 39 files changed, 46 insertions(+), 46 deletions(-) (limited to 'kernel') diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c index e7755e874eb9..c86b0c466744 100644 --- a/arch/i386/kernel/cpu/cpufreq/longrun.c +++ b/arch/i386/kernel/cpu/cpufreq/longrun.c @@ -133,7 +133,7 @@ static int longrun_verify_policy(struct cpufreq_policy *policy) * 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 --git a/arch/i386/kernel/suspend.c b/arch/i386/kernel/suspend.c index cca0d136f36c..427b387efcf7 100644 --- a/arch/i386/kernel/suspend.c +++ b/arch/i386/kernel/suspend.c @@ -113,7 +113,7 @@ void fix_processor_context(void) 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 --git a/arch/mips/au1000/common/serial.c b/arch/mips/au1000/common/serial.c index 64d0ae0299ed..84a926570f13 100644 --- a/arch/mips/au1000/common/serial.c +++ b/arch/mips/au1000/common/serial.c @@ -2703,7 +2703,7 @@ static int __init rs_init(void) * 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 --git a/arch/sh/kernel/pci-dma.c b/arch/sh/kernel/pci-dma.c index f941c3332e92..be0745b162c1 100644 --- a/arch/sh/kernel/pci-dma.c +++ b/arch/sh/kernel/pci-dma.c @@ -24,7 +24,7 @@ void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, 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 --git a/arch/sh/stboards/pcidma.c b/arch/sh/stboards/pcidma.c index 475311390fd6..bbaaded9cff5 100644 --- a/arch/sh/stboards/pcidma.c +++ b/arch/sh/stboards/pcidma.c @@ -24,7 +24,7 @@ void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, 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 --git a/drivers/char/ftape/zftape/zftape-write.c b/drivers/char/ftape/zftape/zftape-write.c index 4f919a1d6c09..43129fdf0b0f 100644 --- a/drivers/char/ftape/zftape/zftape-write.c +++ b/drivers/char/ftape/zftape/zftape-write.c @@ -357,7 +357,7 @@ static int check_write_access(int req_len, *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 --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index f212b0123c19..ad770bc0e537 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -196,9 +196,9 @@ EXPORT_SYMBOL_GPL(ide_dma_intr); * @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 @@ static int ide_build_sglist (ide_drive_t *drive, struct request *rq) * @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 */ diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 64ee462aaa97..03b16beb9f67 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -379,7 +379,7 @@ EXPORT_SYMBOL(ide_cmd); * @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 @@ EXPORT_SYMBOL(ide_stall_queue); * @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 --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 8efb3067b435..ac88b17d4065 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -470,7 +470,7 @@ fixup_address: * @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 @@ static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, in * @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 --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c index 24ecbe874467..72b0c7e03e7d 100644 --- a/drivers/isdn/hisax/amd7930_fn.c +++ b/drivers/isdn/hisax/amd7930_fn.c @@ -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. diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 913ff14167c8..7585bb59f1ba 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -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 --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index dd3860405be2..70ef023f8ff3 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c @@ -521,7 +521,7 @@ hycapi_rx_capipkt 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 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 1566186325cc..cf5a7b05918c 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -499,7 +499,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start, } /* - * 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 --git a/drivers/message/i2o/i2o_core.c b/drivers/message/i2o/i2o_core.c index 93ce837e421c..dc78d1da2b36 100644 --- a/drivers/message/i2o/i2o_core.c +++ b/drivers/message/i2o/i2o_core.c @@ -2120,7 +2120,7 @@ static void i2o_sys_shutdown(void) * @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 --git a/drivers/net/3c527.c b/drivers/net/3c527.c index a6526037a62a..0924264996a3 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c @@ -1168,7 +1168,7 @@ static void mc32_update_stats(struct net_device *dev) * 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 --git a/drivers/net/8390.c b/drivers/net/8390.c index 17b108c09f03..bcd9ce09df88 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -417,7 +417,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) * 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 --git a/drivers/net/e100/e100_config.c b/drivers/net/e100/e100_config.c index 3cd58243ebd8..bff330628916 100644 --- a/drivers/net/e100/e100_config.c +++ b/drivers/net/e100/e100_config.c @@ -149,7 +149,7 @@ e100_config_init_82550(struct e100_private *bdp) * 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 --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 5a89478b13d9..43e30d7b3815 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -1341,7 +1341,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) * 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 --git a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h index 4f8e30868e9f..f055f98fa379 100644 --- a/drivers/net/sk98lin/h/skdrv1st.h +++ b/drivers/net/sk98lin/h/skdrv1st.h @@ -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 --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h index 97f24392a949..e524a4686108 100644 --- a/drivers/net/sk98lin/h/skdrv2nd.h +++ b/drivers/net/sk98lin/h/skdrv2nd.h @@ -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 --git a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c index 26a5dea873c6..65a0da869042 100644 --- a/drivers/net/sk98lin/skgehwt.c +++ b/drivers/net/sk98lin/skgehwt.c @@ -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 --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c index f5fbd7642c58..17e0ff982444 100644 --- a/drivers/net/sk98lin/ski2c.c +++ b/drivers/net/sk98lin/ski2c.c @@ -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 --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c index 67c2fa53361a..24178522d85a 100644 --- a/drivers/net/sk98lin/skxmac2.c +++ b/drivers/net/sk98lin/skxmac2.c @@ -596,7 +596,7 @@ int Port) /* port to stop (MAC_1 + n) */ * 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 --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index 59d584a40c86..4b6259951c0d 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c @@ -197,7 +197,7 @@ dasd_3990_erp_examine(dasd_ccw_req_t * cqr, struct irb * irb) * 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 --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index ad05de941f34..99755d1a6f1a 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c @@ -10866,7 +10866,7 @@ int DiagBusMaster(ULONG port) * Function: DiagEEPROM * * Description: Verfiy checksum and 'Key' and initialize the EEPROM if - * neccessary. + * necessary. * *---------------------------------------------------------------------*/ diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index cda75b428d50..14c983e278d4 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c @@ -245,7 +245,7 @@ oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x) 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 --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 027925455f62..3e00ef1777b0 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -1989,7 +1989,7 @@ static int __register_serial(struct serial_struct *req, int line) * 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 --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 1a7057ae1ac4..69abd70e79cf 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c @@ -159,7 +159,7 @@ static int kobil_startup (struct usb_serial *serial) } 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 --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 12d163c85d2e..37c3b0f45196 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c @@ -1192,7 +1192,7 @@ void leaf_paste_entries ( } - /* 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 --git a/include/asm-arm/arch-sa1100/simpad.h b/include/asm-arm/arch-sa1100/simpad.h index 4f9e10343b30..1527250bd0eb 100644 --- a/include/asm-arm/arch-sa1100/simpad.h +++ b/include/asm-arm/arch-sa1100/simpad.h @@ -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 --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index 6c09c4f01e07..f6c1eaf22a2c 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h @@ -164,7 +164,7 @@ static inline void *__va(unsigned long x) * 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 --git a/include/asm-s390/types.h b/include/asm-s390/types.h index dc52bf8a7acb..fc16a65a356b 100644 --- a/include/asm-s390/types.h +++ b/include/asm-s390/types.h @@ -32,7 +32,7 @@ typedef __signed__ long long __s64; 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 --git a/include/asm-s390x/types.h b/include/asm-s390x/types.h index 2ee9dcb2260b..1163af6aec8d 100644 --- a/include/asm-s390x/types.h +++ b/include/asm-s390x/types.h @@ -32,7 +32,7 @@ typedef unsigned long __u64; /* * 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 --git a/kernel/cpufreq.c b/kernel/cpufreq.c index 5a1118709aed..17d2845accfd 100644 --- a/kernel/cpufreq.c +++ b/kernel/cpufreq.c @@ -1078,11 +1078,11 @@ int cpufreq_set_policy(struct cpufreq_policy *policy) 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 --git a/kernel/suspend.c b/kernel/suspend.c index 5bcf2e90b48a..5801413eeb62 100644 --- a/kernel/suspend.c +++ b/kernel/suspend.c @@ -961,7 +961,7 @@ static int relocate_pagedir(void) 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 --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c index 9a5ff69d5f7e..4207bc101ed4 100644 --- a/net/ipv4/netfilter/ip_conntrack_ftp.c +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c @@ -321,7 +321,7 @@ static int help(const struct iphdr *iph, size_t len, 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 --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c index 98adfbf6eaf9..995bb4b4412e 100644 --- a/net/ipv4/netfilter/ip_conntrack_irc.c +++ b/net/ipv4/netfilter/ip_conntrack_irc.c @@ -199,7 +199,7 @@ static int help(const struct iphdr *iph, size_t len, 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 --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c index 377a50121229..9028334c5112 100644 --- a/net/ipv4/netfilter/ip_nat_core.c +++ b/net/ipv4/netfilter/ip_nat_core.c @@ -288,7 +288,7 @@ find_best_ips_proto(struct ip_conntrack_tuple *tuple, 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 --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index a99047e1792d..30f946968ba1 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -623,7 +623,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff) 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; -- cgit v1.2.3 From cb7a73fdaa2fe77bbef825e0f953e2e0ad7c56df Mon Sep 17 00:00:00 2001 From: Steven Cole Date: Mon, 24 Feb 2003 05:02:54 -0800 Subject: [PATCH] Spelling fixes for relevent -> relevant This patch provides spelling fixes for the following: relevent -> relevant irrelevent -> irrelevant --- arch/arm/kernel/entry-armo.S | 2 +- arch/arm/kernel/entry-armv.S | 8 ++++---- arch/arm/mm/proc-arm6_7.S | 2 +- arch/v850/kernel/ma.c | 2 +- arch/v850/kernel/rte_ma1_cb.c | 2 +- drivers/acpi/hardware/hwregs.c | 2 +- drivers/char/rio/list.h | 2 +- drivers/char/rio/rioparam.c | 2 +- drivers/char/rio/rioroute.c | 2 +- drivers/i2c/i2c-algo-ibm_ocp.c | 2 +- drivers/isdn/hisax/rawhdlc.c | 2 +- drivers/serial/sa1100.c | 2 +- fs/adfs/dir_f.c | 2 +- fs/afs/vnode.c | 2 +- kernel/futex.c | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kernel') diff --git a/arch/arm/kernel/entry-armo.S b/arch/arm/kernel/entry-armo.S index c204f080a304..f081ad9af786 100644 --- a/arch/arm/kernel/entry-armo.S +++ b/arch/arm/kernel/entry-armo.S @@ -426,7 +426,7 @@ Ldata_do: mov r3, sp 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 --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 72245e91600c..c300acd5a385 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1026,7 +1026,7 @@ vector_IRQ: @ 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 @@ vector_data: @ 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 @@ vector_prefetch: 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 @@ vector_undefinstr: 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 --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S index 2c5bf39ab0a4..76b6eed5366c 100644 --- a/arch/arm/mm/proc-arm6_7.S +++ b/arch/arm/mm/proc-arm6_7.S @@ -97,7 +97,7 @@ ENTRY(cpu_arm7_data_abort) 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 --git a/arch/v850/kernel/ma.c b/arch/v850/kernel/ma.c index 15a5c8fec137..0a44ed532823 100644 --- a/arch/v850/kernel/ma.c +++ b/arch/v850/kernel/ma.c @@ -61,7 +61,7 @@ void ma_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud) 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 --git a/arch/v850/kernel/rte_ma1_cb.c b/arch/v850/kernel/rte_ma1_cb.c index d4fb14e9b6a4..f22edc1af8fb 100644 --- a/arch/v850/kernel/rte_ma1_cb.c +++ b/arch/v850/kernel/rte_ma1_cb.c @@ -93,7 +93,7 @@ void __init mach_init_irqs (void) /* 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 --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c index fcc144d58db4..00d844228185 100644 --- a/drivers/acpi/hardware/hwregs.c +++ b/drivers/acpi/hardware/hwregs.c @@ -370,7 +370,7 @@ acpi_set_register ( /* * 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 --git a/drivers/char/rio/list.h b/drivers/char/rio/list.h index ae7368d0fd86..a4f7f1f56255 100644 --- a/drivers/char/rio/list.h +++ b/drivers/char/rio/list.h @@ -111,7 +111,7 @@ static char *_rio_list_h_sccs = "@(#)list.h 1.9" ; /* ** 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 --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c index 069172fec3e8..3b4aa82f162c 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/char/rio/rioparam.c @@ -714,7 +714,7 @@ PKT *PktP; /* ** 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 --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c index ef28ba34247c..e47e580896a8 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/char/rio/rioroute.c @@ -521,7 +521,7 @@ int RIORouteRup( struct rio_info *p, uint Rup, struct Host *HostP, PKT *PacketP /* ** 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 ) { diff --git a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c index 288ac0aac284..63f2b96f37b6 100644 --- a/drivers/i2c/i2c-algo-ibm_ocp.c +++ b/drivers/i2c/i2c-algo-ibm_ocp.c @@ -758,7 +758,7 @@ static int iic_xfer(struct i2c_adapter *i2c_adap, // 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 --git a/drivers/isdn/hisax/rawhdlc.c b/drivers/isdn/hisax/rawhdlc.c index abf82e12035f..4092bf67d58c 100644 --- a/drivers/isdn/hisax/rawhdlc.c +++ b/drivers/isdn/hisax/rawhdlc.c @@ -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 --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index e06be8ade214..90ef26344579 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -327,7 +327,7 @@ static void sa1100_int(int irq, void *dev_id, struct pt_regs *regs) 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)); diff --git a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c index b1028793967f..cee4bb9552d9 100644 --- a/fs/adfs/dir_f.c +++ b/fs/adfs/dir_f.c @@ -259,7 +259,7 @@ adfs_obj2dir(struct adfs_direntry *de, struct object_info *obj) /* * 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 --git a/fs/afs/vnode.c b/fs/afs/vnode.c index ab2d7b241fc3..8fe1cc583413 100644 --- a/fs/afs/vnode.c +++ b/fs/afs/vnode.c @@ -272,7 +272,7 @@ int afs_vnode_fetch_data(afs_vnode_t *vnode, struct afs_rxfs_fetch_descriptor *d /*****************************************************************************/ /* * 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 --git a/kernel/futex.c b/kernel/futex.c index 4cade10892db..81f57f45a93a 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -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; -- cgit v1.2.3 From eaa535e77e30ccdb5c3439041972c612f9c88c72 Mon Sep 17 00:00:00 2001 From: Steven Cole Date: Mon, 24 Feb 2003 05:03:28 -0800 Subject: [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 --- Documentation/DocBook/deviceiobook.tmpl | 2 +- Documentation/networking/sk98lin.txt | 2 +- Documentation/s390/s390dbf.txt | 2 +- arch/i386/kernel/dmi_scan.c | 2 +- arch/i386/pci/visws.c | 2 +- arch/m68knommu/kernel/ints.c | 2 +- drivers/net/3c501.c | 4 ++-- drivers/net/3c527.c | 2 +- drivers/net/sk98lin/skgepnmi.c | 10 +++++----- drivers/net/sungem.h | 2 +- drivers/net/tlan.c | 4 ++-- drivers/s390/block/dasd.c | 2 +- fs/befs/btree.c | 2 +- fs/cifs/cifs_unicode.h | 2 +- fs/eventpoll.c | 2 +- fs/jffs2/compr_rtime.c | 2 +- kernel/pm.c | 2 +- sound/core/seq/seq_timer.c | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kernel') diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl index ed5aa7343935..9ec317a175da 100644 --- a/Documentation/DocBook/deviceiobook.tmpl +++ b/Documentation/DocBook/deviceiobook.tmpl @@ -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 --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 170e3fc40d43..b0220f4dc19d 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt @@ -187,7 +187,7 @@ which you set the parameter (A or B). 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 --git a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt index f8b7a5b89036..e7048364a9f9 100644 --- a/Documentation/s390/s390dbf.txt +++ b/Documentation/s390/s390dbf.txt @@ -14,7 +14,7 @@ in order to analyze the reason for the crash. 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 --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c index 57495ec0d263..179579a1df20 100644 --- a/arch/i386/kernel/dmi_scan.c +++ b/arch/i386/kernel/dmi_scan.c @@ -440,7 +440,7 @@ static __init int broken_pirq(struct dmi_blacklist *d) { 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 diff --git a/arch/i386/pci/visws.c b/arch/i386/pci/visws.c index 50b8df7dd138..c6b4c17f10fa 100644 --- a/arch/i386/pci/visws.c +++ b/arch/i386/pci/visws.c @@ -52,7 +52,7 @@ static int __init visws_map_irq(struct pci_dev *dev, u8 slot, u8 pin) pin--; - /* Nothing usefull at PIIX4 pin 1 */ + /* Nothing useful at PIIX4 pin 1 */ if (bus == pci_bus0 && slot == 4 && pin == 0) return -1; diff --git a/arch/m68knommu/kernel/ints.c b/arch/m68knommu/kernel/ints.c index f7a8eda2522d..290ad865b556 100644 --- a/arch/m68knommu/kernel/ints.c +++ b/arch/m68knommu/kernel/ints.c @@ -214,7 +214,7 @@ void sys_free_irq(unsigned int irq, void *dev_id) /* * 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 --git a/drivers/net/3c501.c b/drivers/net/3c501.c index f11199a62fd8..dd71901bcf32 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c @@ -494,7 +494,7 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev) * @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 @@ static void el_interrupt(int irq, void *dev_id, struct pt_regs *regs) * @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 --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 0924264996a3..3ab32fc653ac 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c @@ -227,7 +227,7 @@ static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); * 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) diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c index a64f88a04560..1adaaec44be8 100644 --- a/drivers/net/sk98lin/skgepnmi.c +++ b/drivers/net/sk98lin/skgepnmi.c @@ -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 @@ -1672,7 +1672,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode allways zero */ * 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. * @@ -1716,7 +1716,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode allways zero */ * 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. * @@ -1935,7 +1935,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode allways zero */ * 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 @@ -6813,7 +6813,7 @@ unsigned int PhysPortIndex) /* Physical port index */ * * 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. * diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index fa113a607ce1..dfa2f1a3ed07 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h @@ -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. diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index b79e603da360..e9282a3075de 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c @@ -1630,7 +1630,7 @@ u32 TLan_HandleDummy( struct net_device *dev, u16 host_int ) * 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 @@ u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int ) * 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 diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 925f885c47b6..7f3830e18b0f 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -1582,7 +1582,7 @@ dasd_sleep_on_immediatly(dasd_ccw_req_t * cqr) /* * 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 --git a/fs/befs/btree.c b/fs/befs/btree.c index c5ed07677b69..b885cf1822e0 100644 --- a/fs/befs/btree.c +++ b/fs/befs/btree.c @@ -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 --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index c0b1ed049983..f4b7ed7ee4ff 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -99,7 +99,7 @@ UniStrcat(wchar_t * ucs1, const wchar_t * ucs2) * 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 --git a/fs/eventpoll.c b/fs/eventpoll.c index d842c2e93d4c..292cb491d30e 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -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) diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c index 64edfea3d531..83dfe53fe91b 100644 --- a/fs/jffs2/compr_rtime.c +++ b/fs/jffs2/compr_rtime.c @@ -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 --git a/kernel/pm.c b/kernel/pm.c index 703467c33802..afffd046c2f6 100644 --- a/kernel/pm.c +++ b/kernel/pm.c @@ -145,7 +145,7 @@ void pm_unregister_all(pm_callback callback) * 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 diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index a18c7107c2a9..8d5dccb1746b 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c @@ -401,7 +401,7 @@ snd_seq_real_time_t snd_seq_timer_get_cur_time(seq_timer_t *tmr) 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) { -- cgit v1.2.3 From 8542637fa47a145ac165d24b4cb2105df1aa2bd0 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 24 Feb 2003 17:04:59 -0800 Subject: [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. --- arch/alpha/kernel/time.c | 2 +- arch/arm/kernel/time.c | 2 +- arch/cris/kernel/time.c | 2 +- arch/i386/kernel/time.c | 2 +- arch/ia64/kernel/time.c | 2 +- arch/m68k/kernel/time.c | 2 +- arch/m68knommu/kernel/time.c | 2 +- arch/mips/kernel/time.c | 2 +- arch/parisc/kernel/time.c | 2 +- arch/ppc/kernel/time.c | 2 +- arch/ppc64/kernel/time.c | 2 +- arch/s390/kernel/time.c | 2 +- arch/s390x/kernel/time.c | 2 +- arch/sh/kernel/time.c | 2 +- arch/sparc/kernel/time.c | 2 +- arch/sparc64/kernel/time.c | 2 +- arch/v850/kernel/time.c | 2 +- arch/x86_64/kernel/time.c | 2 +- fs/proc/array.c | 3 ++- fs/proc/proc_misc.c | 4 ++-- include/linux/time.h | 6 ++++++ kernel/timer.c | 11 +++++++++-- 22 files changed, 37 insertions(+), 23 deletions(-) (limited to 'kernel') diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 0d56b55e52e6..9f0bd3cdaac6 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -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 --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 1cb54c5d5204..f7dbb73f8064 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -32,7 +32,7 @@ #include #include -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; extern unsigned long wall_jiffies; diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 0541e25a48aa..f42806219c68 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c @@ -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 --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index b14b181779f7..79389a99e06f 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -66,7 +66,7 @@ int pit_latch_buggy; /* extern */ #include "do_timer.h" -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; unsigned long cpu_khz; /* Detected as we calibrate the TSC */ diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index b85fe8b701b2..bf603c142328 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -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 --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 03a38781e59e..ecae7f16d614 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -26,7 +26,7 @@ #include #include -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; static inline int set_rtc_mmss(unsigned long nowtime) { diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index c12fb4af61fc..4f7e59167293 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c @@ -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 --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 6adf09fdf6ad..f7551d197dfb 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -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 --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index f45c62784333..9c3f03f25415 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -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 --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 3fef611a7df8..da774859939b 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -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 --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index f534ae598edd..d008d5c6b39e 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c @@ -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 --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 800bbeb8016b..60f8059c5afa 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -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 --git a/arch/s390x/kernel/time.c b/arch/s390x/kernel/time.c index 66115fc37677..53809f47e4b3 100644 --- a/arch/s390x/kernel/time.c +++ b/arch/s390x/kernel/time.c @@ -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 --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 5a17b0510284..3042f8483988 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -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 --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 0254734f1745..77e829f405bf 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c @@ -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 --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 3d716914b158..7503513d4bdc 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c @@ -47,7 +47,7 @@ unsigned long ds1287_regs = 0UL; 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 --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c index a1ecf796407c..5558f6ca4145 100644 --- a/arch/v850/kernel/time.c +++ b/arch/v850/kernel/time.c @@ -25,7 +25,7 @@ #include "mach.h" -u64 jiffies_64; +u64 jiffies_64 = INITIAL_JIFFIES; #define TICK_SIZE (tick_nsec / 1000) diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 5abb00455897..31ec31fc6408 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -30,7 +30,7 @@ #include #endif -u64 jiffies_64; +u64 jiffies_64; extern int using_apic_timer; diff --git a/fs/proc/array.c b/fs/proc/array.c index 37fb278f96d7..186864bb7898 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -358,7 +358,8 @@ int proc_pid_stat(struct task_struct *task, char * buffer) 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 --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 92167d0ecb5f..ca32b7fab254 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -104,7 +104,7 @@ static int uptime_read_proc(char *page, char **start, off_t off, 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 @@ static int kstat_read_proc(char *page, char **start, off_t off, { 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 --git a/include/linux/time.h b/include/linux/time.h index 542e00330d22..7f5be084e342 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -27,6 +27,12 @@ struct timezone { #include #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 --git a/kernel/timer.c b/kernel/timer.c index cabdff7716e7..6e7e23cb95ba 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -757,7 +757,7 @@ static inline void calc_load(unsigned long ticks) } /* 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 @@ asmlinkage long sys_sysinfo(struct sysinfo *info) 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 @@ static void __devinit init_timers_cpu(int cpu) } 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, -- cgit v1.2.3 From f004b8b3335ccb975a122a33990c783db98f8187 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 24 Feb 2003 17:05:06 -0800 Subject: [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. --- kernel/sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/sys.c b/kernel/sys.c index afa6d2fc1372..8e3fb524d641 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -870,7 +870,7 @@ asmlinkage long sys_times(struct tms * tbuf) 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()); } /* -- cgit v1.2.3 From e5137db6b604b9feed0545954e8ea0495fee1249 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Tue, 25 Feb 2003 02:07:36 -0800 Subject: [PATCH] Spelling fixes: doesn't doesnt -> doesn't (35 occurrences) --- arch/i386/kernel/cpu/cyrix.c | 2 +- arch/i386/kernel/irq.c | 2 +- arch/i386/kernel/timers/timer_tsc.c | 2 +- arch/ia64/kernel/irq.c | 2 +- arch/ia64/mm/discontig.c | 2 +- arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c | 2 +- arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 +- arch/mips/baget/wbflush.c | 2 +- arch/mips/kernel/irq.c | 2 +- arch/mips/math-emu/ieee754.c | 2 +- arch/ppc64/boot/addRamDisk.c | 2 +- arch/ppc64/boot/addSystemMap.c | 2 +- arch/ppc64/kernel/lmb.c | 2 +- arch/ppc64/kernel/smp.c | 2 +- arch/sh/kernel/irq.c | 2 +- arch/um/kernel/irq.c | 2 +- arch/v850/kernel/irq.c | 2 +- arch/x86_64/kernel/apic.c | 2 +- arch/x86_64/kernel/io_apic.c | 4 ++-- arch/x86_64/kernel/irq.c | 2 +- drivers/isdn/i4l/isdn_ppp_ccp.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/xfs/xfs_trans_dquot.c | 2 +- include/asm-i386/mach-default/do_timer.h | 2 +- include/asm-i386/pgtable-2level.h | 2 +- include/asm-i386/semaphore.h | 2 +- include/asm-mips/pgtable.h | 2 +- include/asm-mips64/pgtable.h | 2 +- include/asm-sh/semaphore.h | 2 +- include/asm-um/pgtable.h | 2 +- include/asm-x86_64/semaphore.h | 2 +- kernel/fork.c | 2 +- sound/oss/cs4232.c | 2 +- sound/oss/trident.c | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) (limited to 'kernel') diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c index a91dbda9c0db..d477a7ee8157 100644 --- a/arch/i386/kernel/cpu/cyrix.c +++ b/arch/i386/kernel/cpu/cyrix.c @@ -49,7 +49,7 @@ void __init do_cyrix_devid(unsigned char *dir0, unsigned char *dir1) * 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; diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c index 50025095c075..6760e8f41aa3 100644 --- a/arch/i386/kernel/irq.c +++ b/arch/i386/kernel/irq.c @@ -87,7 +87,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c index b21a7fbfdc06..aedbefce21e1 100644 --- a/arch/i386/kernel/timers/timer_tsc.c +++ b/arch/i386/kernel/timers/timer_tsc.c @@ -264,7 +264,7 @@ static int init_tsc(void) * 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 --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 91ac80986823..a35b32f48655 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -104,7 +104,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index f855cb69db21..e39bd20123a7 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -241,7 +241,7 @@ discontig_mem_init(void) * - 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 --git a/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c index 3f9735725182..e1b8dff3d656 100644 --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c @@ -852,7 +852,7 @@ pcibr_slot_info_init(devfs_handle_t pcibr_vhdl, } /* 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. */ diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index e0182d31d13d..351ed0a85961 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c @@ -506,7 +506,7 @@ sn_send_IPI_phys(long physid, int vector, int delivery_mode) 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 --git a/arch/mips/baget/wbflush.c b/arch/mips/baget/wbflush.c index 64c60bc7100f..db3308a3b3de 100644 --- a/arch/mips/baget/wbflush.c +++ b/arch/mips/baget/wbflush.c @@ -17,7 +17,7 @@ void __init wbflush_setup(void) } /* - * 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 --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 446f28d33c7f..cf6fb793e8e0 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -44,7 +44,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/arch/mips/math-emu/ieee754.c b/arch/mips/math-emu/ieee754.c index 5e86e40c678f..3571107088b1 100644 --- a/arch/mips/math-emu/ieee754.c +++ b/arch/mips/math-emu/ieee754.c @@ -3,7 +3,7 @@ * * BUGS * not much dp done - * doesnt generate IEEE754_INEXACT + * doesn't generate IEEE754_INEXACT * */ /* diff --git a/arch/ppc64/boot/addRamDisk.c b/arch/ppc64/boot/addRamDisk.c index f940d0f99177..7f2c09473394 100644 --- a/arch/ppc64/boot/addRamDisk.c +++ b/arch/ppc64/boot/addRamDisk.c @@ -154,7 +154,7 @@ int main(int argc, char **argv) /* 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 --git a/arch/ppc64/boot/addSystemMap.c b/arch/ppc64/boot/addSystemMap.c index 03b9187d0c00..0faf37551da9 100644 --- a/arch/ppc64/boot/addSystemMap.c +++ b/arch/ppc64/boot/addSystemMap.c @@ -146,7 +146,7 @@ int main(int argc, char **argv) /* 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 --git a/arch/ppc64/kernel/lmb.c b/arch/ppc64/kernel/lmb.c index b07040587c8b..81d3ed1ad964 100644 --- a/arch/ppc64/kernel/lmb.c +++ b/arch/ppc64/kernel/lmb.c @@ -73,7 +73,7 @@ lmb_init(void) _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 --git a/arch/ppc64/kernel/smp.c b/arch/ppc64/kernel/smp.c index 389ac2d78eef..44bd8bb70914 100644 --- a/arch/ppc64/kernel/smp.c +++ b/arch/ppc64/kernel/smp.c @@ -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 --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index e44a5e5cf68b..ce84bd4af266 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -61,7 +61,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 53a79e319b20..ed749a24988b 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -45,7 +45,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/arch/v850/kernel/irq.c b/arch/v850/kernel/irq.c index 57b933476b80..7433c7f46653 100644 --- a/arch/v850/kernel/irq.c +++ b/arch/v850/kernel/irq.c @@ -48,7 +48,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 0c2233e6d448..162b351e828e 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c @@ -948,7 +948,7 @@ void smp_local_timer_interrupt(struct pt_regs *regs) /* * 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 --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 0eed1e0c5913..02be6caeecc8 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -685,7 +685,7 @@ void __init setup_ExtINT_IRQ0_pin(unsigned int pin, int vector) 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 @@ static inline void check_timer(void) 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 --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c index ed43656b524e..a5c268e9ecc3 100644 --- a/arch/x86_64/kernel/irq.c +++ b/arch/x86_64/kernel/irq.c @@ -87,7 +87,7 @@ static void ack_none(unsigned int irq) { /* * '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 --git a/drivers/isdn/i4l/isdn_ppp_ccp.c b/drivers/isdn/i4l/isdn_ppp_ccp.c index 974468613755..155e76b1b3d0 100644 --- a/drivers/isdn/i4l/isdn_ppp_ccp.c +++ b/drivers/isdn/i4l/isdn_ppp_ccp.c @@ -197,7 +197,7 @@ ippp_ccp_reset_xmit(struct ippp_ccp *ccp, 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 --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index d21e513937fc..10bc936bbe70 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1245,7 +1245,7 @@ typedef struct smb_com_transaction2_get_dfs_refer_req { __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 --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index 478b2686fc7b..19c83f9d4700 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -755,7 +755,7 @@ xfs_trans_reserve_quota_bydquots( /* * 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 --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h index e41ce3fe29da..8ac79726f5d1 100644 --- a/include/asm-i386/mach-default/do_timer.h +++ b/include/asm-i386/mach-default/do_timer.h @@ -67,7 +67,7 @@ static inline int do_timer_overflow(int count) #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 --git a/include/asm-i386/pgtable-2level.h b/include/asm-i386/pgtable-2level.h index 9f8bdc13adac..c4dbf4cc6cb1 100644 --- a/include/asm-i386/pgtable-2level.h +++ b/include/asm-i386/pgtable-2level.h @@ -42,7 +42,7 @@ static inline int pgd_present(pgd_t pgd) { return 1; } #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 --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h index b4415eef62ce..986da200e5c8 100644 --- a/include/asm-i386/semaphore.h +++ b/include/asm-i386/semaphore.h @@ -76,7 +76,7 @@ static inline void sema_init (struct semaphore *sem, int val) * *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 --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index 3ca40f63456e..8a0fb426172f 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -291,7 +291,7 @@ extern inline void pte_clear(pte_t *ptep) } /* - * (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 --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h index b32768e57d16..b47b11682135 100644 --- a/include/asm-mips64/pgtable.h +++ b/include/asm-mips64/pgtable.h @@ -318,7 +318,7 @@ extern inline void pte_clear(pte_t *ptep) } /* - * (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 --git a/include/asm-sh/semaphore.h b/include/asm-sh/semaphore.h index 9d37ec9a483f..5ec7e3ae768f 100644 --- a/include/asm-sh/semaphore.h +++ b/include/asm-sh/semaphore.h @@ -54,7 +54,7 @@ static inline void sema_init (struct semaphore *sem, int val) * *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 --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h index 2771f2305830..236dd25497bf 100644 --- a/include/asm-um/pgtable.h +++ b/include/asm-um/pgtable.h @@ -226,7 +226,7 @@ static inline void set_pte(pte_t *pteptr, pte_t 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 --git a/include/asm-x86_64/semaphore.h b/include/asm-x86_64/semaphore.h index f3d4293d9d8d..6f42c7af790b 100644 --- a/include/asm-x86_64/semaphore.h +++ b/include/asm-x86_64/semaphore.h @@ -78,7 +78,7 @@ static inline void sema_init (struct semaphore *sem, int val) * *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 --git a/kernel/fork.c b/kernel/fork.c index 8a6032c5f7ec..7ed4fc2a4a46 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -901,7 +901,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, /* * 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 --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c index 7d882eb283e8..6ba7dea7b7b5 100644 --- a/sound/oss/cs4232.c +++ b/sound/oss/cs4232.c @@ -127,7 +127,7 @@ int probe_cs4232(struct address_info *hw_config, int isapnp_configured) * 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 --git a/sound/oss/trident.c b/sound/oss/trident.c index 4aafa78438cd..09a5a99bd4a3 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c @@ -81,7 +81,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 -- cgit v1.2.3 From fe875c98cabed9a797be7d571336df6d1446f3b7 Mon Sep 17 00:00:00 2001 From: Michael Hayes Date: Tue, 25 Feb 2003 02:08:00 -0800 Subject: [PATCH] Spelling fixes: don't dont -> don't (135 occurrences) --- arch/cris/kernel/process.c | 4 ++-- arch/cris/kernel/setup.c | 2 +- arch/cris/kernel/signal.c | 2 +- arch/cris/mm/fault.c | 2 +- arch/cris/mm/tlb.c | 2 +- arch/i386/kernel/apm.c | 2 +- arch/i386/kernel/cpu/cyrix.c | 2 +- arch/i386/kernel/io_apic.c | 2 +- arch/i386/kernel/nmi.c | 2 +- arch/i386/kernel/setup.c | 2 +- arch/i386/lib/mmx.c | 2 +- arch/ia64/ia32/ia32_signal.c | 2 +- arch/ia64/kernel/minstate.h | 4 ++-- arch/ia64/sn/fakeprom/fpmem.c | 2 +- arch/ia64/sn/fakeprom/fw-emu.c | 2 +- arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c | 2 +- arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c | 2 +- arch/ia64/sn/kernel/llsc4.c | 2 +- arch/ia64/sn/kernel/sn1/sn1_smp.c | 2 +- arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/mips/math-emu/ieee754dp.c | 2 +- arch/mips/math-emu/ieee754sp.c | 2 +- arch/mips64/math-emu/ieee754dp.c | 2 +- arch/mips64/math-emu/ieee754sp.c | 2 +- arch/mips64/sgi-ip27/ip27-nmi.c | 2 +- arch/ppc64/kernel/pSeries_lpar.c | 4 ++-- arch/ppc64/xmon/xmon.c | 2 +- arch/sparc/mm/srmmu.c | 2 +- arch/x86_64/kernel/e820.c | 2 +- arch/x86_64/kernel/nmi.c | 2 +- drivers/char/mwave/tp3780i.h | 2 +- drivers/char/watchdog/i810-tco.c | 2 +- drivers/ide/ide-dma.c | 2 +- drivers/ide/ppc/mpc8xx.c | 2 +- drivers/ieee1394/amdtp.c | 4 ++-- drivers/isdn/eicon/eicon_idi.c | 2 +- drivers/isdn/hardware/eicon/i4l_idi.c | 2 +- drivers/isdn/hysdn/hysdn_boot.c | 2 +- drivers/md/md.c | 2 +- drivers/media/radio/miropcm20-rds-core.c | 2 +- drivers/message/fusion/mptscsih.c | 2 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/mtd/devices/blkmtd.c | 6 +++--- drivers/net/8390.c | 2 +- drivers/net/e100/e100_main.c | 2 +- drivers/net/fc/iph5526.c | 8 ++++---- drivers/net/fc/tach_structs.h | 2 +- drivers/net/irda/irtty-sir.c | 2 +- drivers/net/irda/sir_dev.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/tg3.c | 4 ++-- drivers/net/tokenring/madgemc.c | 2 +- drivers/net/wan/comx-hw-munich.c | 2 +- drivers/net/wan/hostess_sv11.c | 2 +- drivers/net/wan/sdla_chdlc.c | 2 +- drivers/net/wan/sdla_ppp.c | 2 +- drivers/net/wan/sealevel.c | 2 +- drivers/net/wan/z85230.c | 2 +- drivers/net/wireless/airo.c | 2 +- drivers/s390/cio/qdio.h | 2 +- drivers/sbus/char/envctrl.c | 6 +++--- drivers/scsi/megaraid.c | 6 +++--- drivers/scsi/ncr53c8xx.c | 4 ++-- drivers/scsi/qlogicfc.c | 2 +- drivers/scsi/sym53c8xx.c | 4 ++-- drivers/scsi/sym53c8xx_2/sym_fw.c | 2 +- drivers/usb/class/bluetty.c | 2 +- drivers/usb/media/konicawc.c | 2 +- drivers/usb/serial/usb-serial.h | 2 +- drivers/video/sa1100fb.c | 2 +- drivers/video/sstfb.c | 2 +- fs/xfs/xfs_attr_leaf.c | 2 +- fs/xfs/xfs_da_btree.c | 4 ++-- fs/xfs/xfs_dir_leaf.c | 2 +- fs/xfs/xfs_dquot.c | 2 +- include/asm-alpha/mman.h | 2 +- include/asm-alpha/rwsem.h | 2 +- include/asm-cris/namei.h | 2 +- include/asm-i386/rwsem.h | 2 +- include/asm-ia64/sn/pci/bridge.h | 2 +- include/asm-ia64/sn/pda.h | 4 ++-- include/asm-ia64/sn/sn1/mmzone_sn1.h | 2 +- include/asm-ia64/sn/sn2/mmzone_sn2.h | 2 +- include/asm-ia64/sn/sn_cpuid.h | 2 +- include/asm-parisc/eisa_eeprom.h | 2 +- include/asm-parisc/mman.h | 2 +- include/asm-ppc64/pgtable.h | 2 +- include/asm-s390/ccwdev.h | 2 +- include/asm-s390/rwsem.h | 2 +- include/asm-s390x/ccwdev.h | 2 +- include/asm-s390x/rwsem.h | 2 +- include/asm-sparc64/rwsem.h | 2 +- include/asm-x86_64/rwsem.h | 2 +- include/linux/rwsem-spinlock.h | 2 +- include/net/irda/vlsi_ir.h | 4 ++-- include/sound/cs46xx_dsp_spos.h | 6 +++--- kernel/exit.c | 2 +- kernel/fork.c | 2 +- kernel/futex.c | 2 +- net/core/dev.c | 2 +- sound/drivers/mtpav.c | 4 ++-- sound/i2c/l3/uda1341.c | 2 +- sound/oss/dmasound/dmasound_awacs.c | 4 ++-- sound/oss/maestro.c | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 4 ++-- sound/pci/cs46xx/dsp_spos_scb_lib.c | 4 ++-- sound/sound_core.c | 2 +- 109 files changed, 134 insertions(+), 134 deletions(-) (limited to 'kernel') diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index 9eb5b73519c5..60441877ef2f 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c @@ -154,7 +154,7 @@ void hard_reset_now (void) #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 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 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 --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index 6ab8d7bc0feb..a97ce40542fd 100644 --- a/arch/cris/kernel/setup.c +++ b/arch/cris/kernel/setup.c @@ -164,7 +164,7 @@ setup_arch(char **cmdline_p) 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 --git a/arch/cris/kernel/signal.c b/arch/cris/kernel/signal.c index a04726efc889..678281dae205 100644 --- a/arch/cris/kernel/signal.c +++ b/arch/cris/kernel/signal.c @@ -494,7 +494,7 @@ handle_signal(int canrestart, unsigned long sig, 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 --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index fa0a6934eed1..2e4d91e40cf9 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c @@ -170,7 +170,7 @@ handle_mmu_bus_fault(struct pt_regs *regs) 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 --git a/arch/cris/mm/tlb.c b/arch/cris/mm/tlb.c index 9d5e588d8028..f5a97c9799fd 100644 --- a/arch/cris/mm/tlb.c +++ b/arch/cris/mm/tlb.c @@ -58,7 +58,7 @@ flush_tlb_all(void) 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 --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index d21b59a85ede..67e9015e6400 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -1096,7 +1096,7 @@ static int apm_engage_power_management(u_short device, int enable) * @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 --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c index d477a7ee8157..a09e70fa105a 100644 --- a/arch/i386/kernel/cpu/cyrix.c +++ b/arch/i386/kernel/cpu/cyrix.c @@ -77,7 +77,7 @@ static char cyrix_model_mult2[] __initdata = "12233445"; * 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 --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 3d810b4996c6..7f2892e1e35e 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -46,7 +46,7 @@ static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED; /* * 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; diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index 682446a5c050..ed31b7804c06 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c @@ -325,7 +325,7 @@ static spinlock_t nmi_print_lock = SPIN_LOCK_UNLOCKED; * 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 --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 37444600d272..203b37b81679 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -818,7 +818,7 @@ static void __init register_memory(unsigned long max_low_pfn) 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 --git a/arch/i386/lib/mmx.c b/arch/i386/lib/mmx.c index 8a49853d00de..d6fc84f375e3 100644 --- a/arch/i386/lib/mmx.c +++ b/arch/i386/lib/mmx.c @@ -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 --git a/arch/ia64/ia32/ia32_signal.c b/arch/ia64/ia32/ia32_signal.c index de4213cf1a5a..6715c8ad2456 100644 --- a/arch/ia64/ia32/ia32_signal.c +++ b/arch/ia64/ia32/ia32_signal.c @@ -338,7 +338,7 @@ restore_ia32_fpstate_live (struct _fpstate_ia32 *save) /* * 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 --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h index ed1d91daafac..800c929e93d4 100644 --- a/arch/ia64/kernel/minstate.h +++ b/arch/ia64/kernel/minstate.h @@ -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 --git a/arch/ia64/sn/fakeprom/fpmem.c b/arch/ia64/sn/fakeprom/fpmem.c index ca74fcbab4b5..2c58cd9a1884 100644 --- a/arch/ia64/sn/fakeprom/fpmem.c +++ b/arch/ia64/sn/fakeprom/fpmem.c @@ -226,7 +226,7 @@ build_efi_memmap(void *md, int mdsize) 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 --git a/arch/ia64/sn/fakeprom/fw-emu.c b/arch/ia64/sn/fakeprom/fw-emu.c index 8ba4632dbb33..792abb0a59b9 100644 --- a/arch/ia64/sn/fakeprom/fw-emu.c +++ b/arch/ia64/sn/fakeprom/fw-emu.c @@ -757,7 +757,7 @@ sys_fw_init (const char *args, int arglen, int bsp) 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 --git a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c index b4ebde013027..9fbe205c7633 100644 --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c @@ -1527,7 +1527,7 @@ pcibr_attach2(devfs_handle_t xconn_vhdl, bridge_t *bridge, /* 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 --git a/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c index e1b8dff3d656..98d005171bc2 100644 --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c @@ -803,7 +803,7 @@ pcibr_slot_info_init(devfs_handle_t pcibr_vhdl, * '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 diff --git a/arch/ia64/sn/kernel/llsc4.c b/arch/ia64/sn/kernel/llsc4.c index bc4ba40372f2..38373739789d 100644 --- a/arch/ia64/sn/kernel/llsc4.c +++ b/arch/ia64/sn/kernel/llsc4.c @@ -301,7 +301,7 @@ ran_conf_llsc(int thread) */ 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 --git a/arch/ia64/sn/kernel/sn1/sn1_smp.c b/arch/ia64/sn/kernel/sn1/sn1_smp.c index affeb952350f..e24f97eba657 100644 --- a/arch/ia64/sn/kernel/sn1/sn1_smp.c +++ b/arch/ia64/sn/kernel/sn1/sn1_smp.c @@ -100,7 +100,7 @@ extern void smp_send_flush_tlb (void) __attribute((weak)); /* * 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 --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 351ed0a85961..1850229970c1 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c @@ -395,7 +395,7 @@ sn2_global_tlb_purge (unsigned long start, unsigned long end, unsigned long nbit 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); diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 30634e314992..26a70f6d1a13 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -775,7 +775,7 @@ void __init setup_arch(char **cmdline_p) 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 --git a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c index 62e017706a4c..f1647fb0318c 100644 --- a/arch/mips/math-emu/ieee754dp.c +++ b/arch/mips/math-emu/ieee754dp.c @@ -106,7 +106,7 @@ ieee754dp ieee754dp_bestnan(ieee754dp x, ieee754dp y) */ 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 --git a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c index adb1d635abd0..29546fcf0d05 100644 --- a/arch/mips/math-emu/ieee754sp.c +++ b/arch/mips/math-emu/ieee754sp.c @@ -107,7 +107,7 @@ ieee754sp ieee754sp_bestnan(ieee754sp x, ieee754sp y) */ 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 --git a/arch/mips64/math-emu/ieee754dp.c b/arch/mips64/math-emu/ieee754dp.c index 62e017706a4c..f1647fb0318c 100644 --- a/arch/mips64/math-emu/ieee754dp.c +++ b/arch/mips64/math-emu/ieee754dp.c @@ -106,7 +106,7 @@ ieee754dp ieee754dp_bestnan(ieee754dp x, ieee754dp y) */ 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 --git a/arch/mips64/math-emu/ieee754sp.c b/arch/mips64/math-emu/ieee754sp.c index adb1d635abd0..29546fcf0d05 100644 --- a/arch/mips64/math-emu/ieee754sp.c +++ b/arch/mips64/math-emu/ieee754sp.c @@ -107,7 +107,7 @@ ieee754sp ieee754sp_bestnan(ieee754sp x, ieee754sp y) */ 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 --git a/arch/mips64/sgi-ip27/ip27-nmi.c b/arch/mips64/sgi-ip27/ip27-nmi.c index 8b03918f817a..8ba5ff58da0a 100644 --- a/arch/mips64/sgi-ip27/ip27-nmi.c +++ b/arch/mips64/sgi-ip27/ip27-nmi.c @@ -127,7 +127,7 @@ cont_nmi_dump(void) * 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 --git a/arch/ppc64/kernel/pSeries_lpar.c b/arch/ppc64/kernel/pSeries_lpar.c index f1e9f2d3f8a4..653759fcde14 100644 --- a/arch/ppc64/kernel/pSeries_lpar.c +++ b/arch/ppc64/kernel/pSeries_lpar.c @@ -461,7 +461,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group, 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 @@ static long pSeries_lpar_hpte_remove(unsigned long hpte_group) 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 --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c index 4318a6c7318d..a2d0f517177b 100644 --- a/arch/ppc64/xmon/xmon.c +++ b/arch/ppc64/xmon/xmon.c @@ -2072,7 +2072,7 @@ find_tb_table(unsigned long codeaddr, struct tbtable *tab) 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 --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index e9aab3723ad1..9a55259ae6b2 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -2120,7 +2120,7 @@ static void __init get_srmmu_type(void) srmmu_is_bad(); } -/* dont laugh, static pagetables */ +/* don't laugh, static pagetables */ static void srmmu_check_pgt_cache(int low, int high) { } diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c index c82c2332b73b..2ead9043b5aa 100644 --- a/arch/x86_64/kernel/e820.c +++ b/arch/x86_64/kernel/e820.c @@ -204,7 +204,7 @@ void __init e820_reserve_resources(void) 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 --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 50523c5f9d2d..0d749d4e8fef 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c @@ -228,7 +228,7 @@ static spinlock_t nmi_print_lock = SPIN_LOCK_UNLOCKED; * 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 --git a/drivers/char/mwave/tp3780i.h b/drivers/char/mwave/tp3780i.h index 70fde5ceffca..fc049acc89e6 100644 --- a/drivers/char/mwave/tp3780i.h +++ b/drivers/char/mwave/tp3780i.h @@ -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 --git a/drivers/char/watchdog/i810-tco.c b/drivers/char/watchdog/i810-tco.c index 8f571d22fd58..e3770ba7d027 100644 --- a/drivers/char/watchdog/i810-tco.c +++ b/drivers/char/watchdog/i810-tco.c @@ -161,7 +161,7 @@ static int tco_timer_settimer (unsigned char tmrval) } /* - * 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 */ diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ad770bc0e537..6b034958f454 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -454,7 +454,7 @@ static int config_drive_for_dma (ide_drive_t *drive) * 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 --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index 8f4b257502ab..35b745e0e5cb 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c @@ -331,7 +331,7 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port, (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 --git a/drivers/ieee1394/amdtp.c b/drivers/ieee1394/amdtp.c index a42c71cc4911..0b382a2af0e7 100644 --- a/drivers/ieee1394/amdtp.c +++ b/drivers/ieee1394/amdtp.c @@ -228,7 +228,7 @@ struct stream { /* 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 @@ static void fill_packet(struct stream *s, struct packet *packet, int nevents) /* 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 --git a/drivers/isdn/eicon/eicon_idi.c b/drivers/isdn/eicon/eicon_idi.c index fc341e1b396c..f1e4df4477ec 100644 --- a/drivers/isdn/eicon/eicon_idi.c +++ b/drivers/isdn/eicon/eicon_idi.c @@ -2717,7 +2717,7 @@ idi_handle_ack_ok(eicon_card *ccard, eicon_chan *chan, eicon_RC *ack) 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 --git a/drivers/isdn/hardware/eicon/i4l_idi.c b/drivers/isdn/hardware/eicon/i4l_idi.c index 574cefc99b0d..8a49e52f6acf 100644 --- a/drivers/isdn/hardware/eicon/i4l_idi.c +++ b/drivers/isdn/hardware/eicon/i4l_idi.c @@ -2717,7 +2717,7 @@ idi_handle_ack_ok(eicon_card *ccard, eicon_chan *chan, eicon_RC *ack) 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 --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c index bf8756c0954f..6c04281e57b8 100644 --- a/drivers/isdn/hysdn/hysdn_boot.c +++ b/drivers/isdn/hysdn/hysdn_boot.c @@ -357,7 +357,7 @@ EvalSysrTokData(hysdn_card * card, uchar * cp, int len) 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 --git a/drivers/md/md.c b/drivers/md/md.c index af325567f3be..c5314a2c3719 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1427,7 +1427,7 @@ static int do_md_run(mddev_t * mddev) /* * '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); diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c index bc2f1a70574e..79169561480e 100644 --- a/drivers/media/radio/miropcm20-rds-core.c +++ b/drivers/media/radio/miropcm20-rds-core.c @@ -91,7 +91,7 @@ static int rds_waitread(void) } } -/* 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 --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 6364ef3f991e..64fc29943c62 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c @@ -4207,7 +4207,7 @@ static const char * ascq_set_strings_4max( /* * 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 --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 61fe2369e8f4..bca0fe2be25e 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c @@ -1729,7 +1729,7 @@ static void i2o_block_exit(void) * 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 --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c index 1a23febb19cb..e29472dfe093 100644 --- a/drivers/mtd/devices/blkmtd.c +++ b/drivers/mtd/devices/blkmtd.c @@ -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. @@ -350,7 +350,7 @@ static int write_queue_task(void *data) 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) { diff --git a/drivers/net/8390.c b/drivers/net/8390.c index bcd9ce09df88..37c417e3f7ce 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -277,7 +277,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) /* 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); diff --git a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c index 9e6eb459ad1f..08c7df15f2d3 100644 --- a/drivers/net/e100/e100_main.c +++ b/drivers/net/e100/e100_main.c @@ -2236,7 +2236,7 @@ e100_start_cu(struct e100_private *bdp, tcb_t *tcb) 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 --git a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c index 91bcc8df5c37..4aec0f87b680 100644 --- a/drivers/net/fc/iph5526.c +++ b/drivers/net/fc/iph5526.c @@ -748,7 +748,7 @@ int index, no_of_entries = 0; 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 r_ctl = RCTL_ELS_UCTL; 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 @@ int count = 0; } /* 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 @@ u_int s_id; /* 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 --git a/drivers/net/fc/tach_structs.h b/drivers/net/fc/tach_structs.h index ef7ecd7dce8c..f59a3d0e84d7 100644 --- a/drivers/net/fc/tach_structs.h +++ b/drivers/net/fc/tach_structs.h @@ -248,7 +248,7 @@ struct globals { 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 --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 21160eb0e671..3049b0f6e74f 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c @@ -532,7 +532,7 @@ static int irtty_open(struct tty_struct *tty) 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 --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index 09823085fa2d..e14b8d2bbf60 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c @@ -569,7 +569,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n /* 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 --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 43e30d7b3815..36d9b30b2bd2 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -1226,7 +1226,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) /* 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); diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index c1596c4fa593..97166e223db4 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c @@ -1971,7 +1971,7 @@ static int sis900_set_config(struct net_device *dev, struct ifmap *map) 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 --git a/drivers/net/tg3.c b/drivers/net/tg3.c index b37ce4a383db..339ba4b698c1 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -3303,7 +3303,7 @@ static u32 tg3FwRodata[(TG3_FW_RODATA_LEN / sizeof(u32)) + 1] = { 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 +3736,7 @@ u32 tg3TsoFwRodata[] = { 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 diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 955235cd5777..3e7aea7205bf 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c @@ -80,7 +80,7 @@ static void madgemc_setint(struct net_device *dev, int val); 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 --git a/drivers/net/wan/comx-hw-munich.c b/drivers/net/wan/comx-hw-munich.c index fc5d622ecbd1..80be08dd1086 100644 --- a/drivers/net/wan/comx-hw-munich.c +++ b/drivers/net/wan/comx-hw-munich.c @@ -1304,7 +1304,7 @@ static void MUNICH_interrupt(int irq, void *dev_id, struct pt_regs *regs) 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 --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c index 3c8aab035220..e9065c3ab72e 100644 --- a/drivers/net/wan/hostess_sv11.c +++ b/drivers/net/wan/hostess_sv11.c @@ -61,7 +61,7 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb) 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 --git a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c index 347ae5cdfa1b..350ad8d2e627 100644 --- a/drivers/net/wan/sdla_chdlc.c +++ b/drivers/net/wan/sdla_chdlc.c @@ -3529,7 +3529,7 @@ static int config_chdlc (sdla_t *card) 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 --git a/drivers/net/wan/sdla_ppp.c b/drivers/net/wan/sdla_ppp.c index beda9294b0ef..457a59673f02 100644 --- a/drivers/net/wan/sdla_ppp.c +++ b/drivers/net/wan/sdla_ppp.c @@ -3418,7 +3418,7 @@ static int config_ppp (sdla_t *card) 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 --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index e7e14c2988db..229e64c58a66 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c @@ -62,7 +62,7 @@ static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb) 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 --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c index 79235cbce134..d2473ea84eec 100644 --- a/drivers/net/wan/z85230.c +++ b/drivers/net/wan/z85230.c @@ -1634,7 +1634,7 @@ static void z8530_rx_done(struct z8530_channel *c) 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 --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index e2b3f7a202b6..79e38ca87810 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -2213,7 +2213,7 @@ static void enable_interrupts( struct airo_info *ai ) { /* 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 ) { diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h index 960735162da1..ffae6208402c 100644 --- a/drivers/s390/cio/qdio.h +++ b/drivers/s390/cio/qdio.h @@ -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 --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index bf97d2efafa5..1c1e7339d9b3 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -810,7 +810,7 @@ static void envctrl_init_fanstat(struct i2c_child_t *pchild) 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 @@ static void envctrl_init_globaladdr(struct i2c_child_t *pchild) } /* 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 @@ static void envctrl_init_voltage_status(struct i2c_child_t *pchild) 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; } diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 9fd98b34e45c..dac3306c42d9 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -1714,7 +1714,7 @@ static int mega_driver_ioctl (mega_host_config * megaCfg, Scsi_Cmnd * SCpnt) 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 @@ static int mega_findCard (Scsi_Host_Template * pHostTmpl, #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 @@ static int mega_findCard (Scsi_Host_Template * pHostTmpl, * 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 --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index f2f9688fcea5..a02be17066af 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c @@ -3090,7 +3090,7 @@ ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int len) case 0x8: /* ** JUMP / CALL - ** dont't relocate if relative :-) + ** don't relocate if relative :-) */ if (opcode & 0x00800000) relocs = 0; @@ -5852,7 +5852,7 @@ static void ncr_getsync(ncb_p np, u_char sfac, u_char *fakp, u_char *scntl3p) /* ** 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 --git a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c index f973a25fe23d..2bb9ad10ba73 100644 --- a/drivers/scsi/qlogicfc.c +++ b/drivers/scsi/qlogicfc.c @@ -1563,7 +1563,7 @@ void isp2x00_intr_handler(int irq, void *dev_id, struct pt_regs *regs) /* * 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 --git a/drivers/scsi/sym53c8xx.c b/drivers/scsi/sym53c8xx.c index 396ecd80e1d7..d3daba09fc75 100644 --- a/drivers/scsi/sym53c8xx.c +++ b/drivers/scsi/sym53c8xx.c @@ -4631,7 +4631,7 @@ ncr_script_copy_and_bind (ncb_p np,ncrcmd *src,ncrcmd *dst,int len) case 0x8: /* ** JUMP / CALL - ** dont't relocate if relative :-) + ** don't relocate if relative :-) */ if (opcode & 0x00800000) relocs = 0; @@ -7953,7 +7953,7 @@ static void ncr_getsync(ncb_p np, u_char sfac, u_char *fakp, u_char *scntl3p) /* ** 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 --git a/drivers/scsi/sym53c8xx_2/sym_fw.c b/drivers/scsi/sym53c8xx_2/sym_fw.c index 46858e893e2a..bcdd7c5297e0 100644 --- a/drivers/scsi/sym53c8xx_2/sym_fw.c +++ b/drivers/scsi/sym53c8xx_2/sym_fw.c @@ -539,7 +539,7 @@ void sym_fw_bind_script (hcb_p np, u32 *start, int len) case 0x8: /* * JUMP / CALL - * dont't relocate if relative :-) + * don't relocate if relative :-) */ if (opcode & 0x00800000) relocs = 0; diff --git a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c index 0a1f56e63cde..d7cc97c9eff1 100644 --- a/drivers/usb/class/bluetty.c +++ b/drivers/usb/class/bluetty.c @@ -267,7 +267,7 @@ static inline struct usb_bluetooth* get_usb_bluetooth (struct usb_bluetooth *blu { 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 --git a/drivers/usb/media/konicawc.c b/drivers/usb/media/konicawc.c index d36121785bb9..90049bc8993a 100644 --- a/drivers/usb/media/konicawc.c +++ b/drivers/usb/media/konicawc.c @@ -266,7 +266,7 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur 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) { diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h index 78175b05171d..5389343ecaf7 100644 --- a/drivers/usb/serial/usb-serial.h +++ b/drivers/usb/serial/usb-serial.h @@ -342,7 +342,7 @@ static inline struct usb_serial* get_usb_serial (struct usb_serial_port *port, c 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 --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 39da1994574d..3d96bd9bd6dc 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -1370,7 +1370,7 @@ static void sa1100fb_disable_controller(struct sa1100fb_info *fbi) #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 --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index d23f97ed5617..90abf200ad73 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c @@ -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 --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index 6dd7d0b23c4b..0867745661bf 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c @@ -1374,7 +1374,7 @@ xfs_attr_leaf_toosmall(xfs_da_state_t *state, int *action) 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 --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index b42ce0313a5b..b8fc94e8be2b 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c @@ -830,8 +830,8 @@ xfs_da_node_toosmall(xfs_da_state_t *state, int *action) 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 --git a/fs/xfs/xfs_dir_leaf.c b/fs/xfs/xfs_dir_leaf.c index 8dfb1ab6ff2f..267565a82e89 100644 --- a/fs/xfs/xfs_dir_leaf.c +++ b/fs/xfs/xfs_dir_leaf.c @@ -1341,7 +1341,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action) 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 --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index 775852ce66f2..2a8c831e5716 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -840,7 +840,7 @@ xfs_qm_dqlookup( * 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. */ diff --git a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h index ded73a94a99d..caa92997d4fe 100644 --- a/include/asm-alpha/mman.h +++ b/include/asm-alpha/mman.h @@ -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 --git a/include/asm-alpha/rwsem.h b/include/asm-alpha/rwsem.h index c3abe5d2d41b..8e058a67c9a4 100644 --- a/include/asm-alpha/rwsem.h +++ b/include/asm-alpha/rwsem.h @@ -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 --git a/include/asm-cris/namei.h b/include/asm-cris/namei.h index f244273e332a..8a3be7a6d9f6 100644 --- a/include/asm-cris/namei.h +++ b/include/asm-cris/namei.h @@ -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 --git a/include/asm-i386/rwsem.h b/include/asm-i386/rwsem.h index 99f682b5d82a..7625a675852f 100644 --- a/include/asm-i386/rwsem.h +++ b/include/asm-i386/rwsem.h @@ -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 --git a/include/asm-ia64/sn/pci/bridge.h b/include/asm-ia64/sn/pci/bridge.h index 13b7416dc1b4..4cff43a4e009 100644 --- a/include/asm-ia64/sn/pci/bridge.h +++ b/include/asm-ia64/sn/pci/bridge.h @@ -1684,7 +1684,7 @@ typedef volatile struct bridge_s { /* 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 --git a/include/asm-ia64/sn/pda.h b/include/asm-ia64/sn/pda.h index 20c7772d7427..a6e5c3046137 100644 --- a/include/asm-ia64/sn/pda.h +++ b/include/asm-ia64/sn/pda.h @@ -84,10 +84,10 @@ typedef struct pda_s { * 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 --git a/include/asm-ia64/sn/sn1/mmzone_sn1.h b/include/asm-ia64/sn/sn1/mmzone_sn1.h index 5202f5544187..a9e1f9cdd1b9 100644 --- a/include/asm-ia64/sn/sn1/mmzone_sn1.h +++ b/include/asm-ia64/sn/sn1/mmzone_sn1.h @@ -130,7 +130,7 @@ typedef signed short cnodeid_t; /* * 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 --git a/include/asm-ia64/sn/sn2/mmzone_sn2.h b/include/asm-ia64/sn/sn2/mmzone_sn2.h index 9acc591629e3..e495529d7873 100644 --- a/include/asm-ia64/sn/sn2/mmzone_sn2.h +++ b/include/asm-ia64/sn/sn2/mmzone_sn2.h @@ -137,7 +137,7 @@ typedef signed short cnodeid_t; /* * 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 --git a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h index 6b6106def193..3a56e4aeff32 100644 --- a/include/asm-ia64/sn/sn_cpuid.h +++ b/include/asm-ia64/sn/sn_cpuid.h @@ -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 --git a/include/asm-parisc/eisa_eeprom.h b/include/asm-parisc/eisa_eeprom.h index 5b229737a6b4..5ba85370533e 100644 --- a/include/asm-parisc/eisa_eeprom.h +++ b/include/asm-parisc/eisa_eeprom.h @@ -25,7 +25,7 @@ struct eeprom_header 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 --git a/include/asm-parisc/mman.h b/include/asm-parisc/mman.h index 0ae731597f20..b5c3bd6ced72 100644 --- a/include/asm-parisc/mman.h +++ b/include/asm-parisc/mman.h @@ -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 --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h index 3b13d9cd1fd8..3f3c45af31a3 100644 --- a/include/asm-ppc64/pgtable.h +++ b/include/asm-ppc64/pgtable.h @@ -198,7 +198,7 @@ extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)]; * 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 --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h index 33e529f2a985..37a20bbced3f 100644 --- a/include/asm-s390/ccwdev.h +++ b/include/asm-s390/ccwdev.h @@ -120,7 +120,7 @@ struct ccw_driver { /* 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 --git a/include/asm-s390/rwsem.h b/include/asm-s390/rwsem.h index 6cdb35473f59..dec5c522ff7e 100644 --- a/include/asm-s390/rwsem.h +++ b/include/asm-s390/rwsem.h @@ -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 --git a/include/asm-s390x/ccwdev.h b/include/asm-s390x/ccwdev.h index 33e529f2a985..37a20bbced3f 100644 --- a/include/asm-s390x/ccwdev.h +++ b/include/asm-s390x/ccwdev.h @@ -120,7 +120,7 @@ struct ccw_driver { /* 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 --git a/include/asm-s390x/rwsem.h b/include/asm-s390x/rwsem.h index c40062c2875c..9ffabfed0afe 100644 --- a/include/asm-s390x/rwsem.h +++ b/include/asm-s390x/rwsem.h @@ -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 --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h index fb100f981554..7d3e788980e1 100644 --- a/include/asm-sparc64/rwsem.h +++ b/include/asm-sparc64/rwsem.h @@ -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 --git a/include/asm-x86_64/rwsem.h b/include/asm-x86_64/rwsem.h index ec30383d6b9c..fdada1f26b74 100644 --- a/include/asm-x86_64/rwsem.h +++ b/include/asm-x86_64/rwsem.h @@ -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 --git a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h index f4ac435bf141..b52a2af25f1f 100644 --- a/include/linux/rwsem-spinlock.h +++ b/include/linux/rwsem-spinlock.h @@ -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 --git a/include/net/irda/vlsi_ir.h b/include/net/irda/vlsi_ir.h index f2c66f9296ed..1d209ac6e02a 100644 --- a/include/net/irda/vlsi_ir.h +++ b/include/net/irda/vlsi_ir.h @@ -382,7 +382,7 @@ enum vlsi_pio_irenable { * 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 @@ enum vlsi_pio_irenable { * PREAMB = 1 * * FIR-mode: BAUD = 0 - * PLSWID: dont care + * PLSWID: don't care * PREAMB = 15 */ diff --git a/include/sound/cs46xx_dsp_spos.h b/include/sound/cs46xx_dsp_spos.h index 14710ff45bda..a6006b75c0e2 100644 --- a/include/sound/cs46xx_dsp_spos.h +++ b/include/sound/cs46xx_dsp_spos.h @@ -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 --git a/kernel/exit.c b/kernel/exit.c index f01c77dfcee1..ffc0973ab074 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -482,7 +482,7 @@ static inline void choose_new_parent(task_t *p, task_t *reaper, task_t *child_re 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 --git a/kernel/fork.c b/kernel/fork.c index 7ed4fc2a4a46..ce4d721d0ced 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -446,7 +446,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) 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); diff --git a/kernel/futex.c b/kernel/futex.c index 81f57f45a93a..dfd03a0cdad8 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -297,7 +297,7 @@ static int futex_wait(unsigned long uaddr, 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 --git a/net/core/dev.c b/net/core/dev.c index 5535abdd4c3a..dc35425756a9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1215,7 +1215,7 @@ static void get_sample_stats(int cpu) #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 --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index f8dc6a1a6078..9ba040bbaca5 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c @@ -102,7 +102,7 @@ MODULE_PARM_SYNTAX(hwports, SNDRV_ENABLED ",allows:{{1,8}},dialog:list"); /* * 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 @@ static int __init alsa_card_mtpav_init(void) 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 --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c index 09342a8b9996..218c2c1d365e 100644 --- a/sound/i2c/l3/uda1341.c +++ b/sound/i2c/l3/uda1341.c @@ -494,7 +494,7 @@ static int snd_uda1341_info_enum(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * 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 --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 1a87e3a09720..28a767651b4b 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c @@ -1354,7 +1354,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when) 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 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev); 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 --git a/sound/oss/maestro.c b/sound/oss/maestro.c index 4f124d931872..ab667b4a6026 100644 --- a/sound/oss/maestro.c +++ b/sound/oss/maestro.c @@ -3507,7 +3507,7 @@ maestro_probe(struct pci_dev *pcidev,const struct pci_device_id *pdid) * 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 --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 2eefcdf9606a..9ce304569dc3 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -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 @@ static void snd_cs46xx_sec_codec_reset (ac97_t * ac97) 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 --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c index 4b24fee1b481..d87313c4b95a 100644 --- a/sound/pci/cs46xx/dsp_spos_scb_lib.c +++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c @@ -1540,7 +1540,7 @@ int cs46xx_dsp_enable_spdif_out (cs46xx_t *chip) 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 @@ int cs46xx_dsp_disable_spdif_out (cs46xx_t *chip) { 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 --git a/sound/sound_core.c b/sound/sound_core.c index 232ce05e0e44..d958a30a56d4 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -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... -- cgit v1.2.3 From 69508a7cd793db94c8af3e221802a3bb0d9a611f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 25 Feb 2003 02:26:20 -0800 Subject: [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. --- kernel/module.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/module.c b/kernel/module.c index 00d8b07c4fd1..cf8d8cb01022 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -173,16 +173,19 @@ static int use_module(struct module *a, struct module *b) 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; } @@ -1456,10 +1459,12 @@ sys_init_module(void *umod, } /* 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; } -- cgit v1.2.3 From 26c91ca0ee80493fc62809b0216ab092f536f363 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 25 Feb 2003 02:26:27 -0800 Subject: [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. --- kernel/module.c | 164 +++++++++++++++----------------------------------------- 1 file changed, 44 insertions(+), 120 deletions(-) (limited to 'kernel') diff --git a/kernel/module.c b/kernel/module.c index cf8d8cb01022..705e3cff7c60 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -76,6 +76,22 @@ int init_module(void) } 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, @@ -878,45 +894,6 @@ void *__symbol_get(const char *symbol) } 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, @@ -1106,93 +1083,16 @@ static struct module *load_module(void *umod, 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; - - /* 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")) @@ -1200,6 +1100,14 @@ static struct module *load_module(void *umod, #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; @@ -1207,6 +1115,18 @@ static struct module *load_module(void *umod, } 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; @@ -1339,10 +1259,14 @@ static struct module *load_module(void *umod, 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); + 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; } -- cgit v1.2.3 From 1a1b64954df11fb4a317001de0ce9e427fbb8dd2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 25 Feb 2003 03:24:48 -0800 Subject: Fix up kernel/module.c breakage. Bad Rusty! --- kernel/module.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kernel') diff --git a/kernel/module.c b/kernel/module.c index 705e3cff7c60..bf6859b3cd73 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1083,6 +1083,9 @@ static struct module *load_module(void *umod, sechdrs = (void *)hdr + hdr->e_shoff; secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; + /* And these should exist, but gcc whinges if we don't init them */ + symindex = strindex = 0; + for (i = 1; i < hdr->e_shnum; i++) { /* Mark all sections sh_addr with their address in the temporary image. */ @@ -1261,6 +1264,7 @@ static struct module *load_module(void *umod, /* Now do relocations. */ for (i = 1; i < hdr->e_shnum; i++) { + const char *strtab = (char *)sechdrs[strindex].sh_addr; if (sechdrs[i].sh_type == SHT_REL) err = apply_relocate(sechdrs, strtab, symindex, i, mod); -- cgit v1.2.3 From 5845c70715afbbdd27b934a2a50bb71a3b72253f Mon Sep 17 00:00:00 2001 From: Art Haas Date: Wed, 26 Feb 2003 15:17:53 -0800 Subject: [PATCH] Trivial C99 changes for kernel/posix-timers.c --- kernel/posix-timers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 95ada3e0f563..add2e8abd710 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -1207,7 +1207,7 @@ do_clock_nanosleep(clockid_t which_clock, int flags, struct timespec *tsave) { struct timespec t; struct timer_list new_timer; - struct abs_struct abs_struct = { list:{next:0} }; + struct abs_struct abs_struct = { .list = { .next = 0 } }; int abs; int rtn = 0; int active; -- cgit v1.2.3