Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

typo fixes: aquire -> acquire

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>

+30 -30
+1 -1
Documentation/digiepca.txt
··· 2 2 http://www.digi.com for PCI cards. They no longer maintain this driver, 3 3 and have no 2.6 driver for ISA cards. 4 4 5 - This driver requires a number of user-space tools. They can be aquired from 5 + This driver requires a number of user-space tools. They can be acquired from 6 6 http://www.digi.com, but only works with 2.4 kernels. 7 7 8 8
+1 -1
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
··· 3048 3048 </para> 3049 3049 3050 3050 <para> 3051 - If you aquire a spinlock in the interrupt handler, and the 3051 + If you acquire a spinlock in the interrupt handler, and the 3052 3052 lock is used in other pcm callbacks, too, then you have to 3053 3053 release the lock before calling 3054 3054 <function>snd_pcm_period_elapsed()</function>, because
+2 -2
drivers/char/isicom.c
··· 245 245 printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", 246 246 card->base); 247 247 248 - return 0; /* Failed to aquire the card! */ 248 + return 0; /* Failed to acquire the card! */ 249 249 } 250 250 251 251 static int lock_card_at_interrupt(struct isi_board *card) ··· 262 262 spin_unlock_irqrestore(&card->card_lock, card->flags); 263 263 } 264 264 /* Failing in interrupt is an acceptable event */ 265 - return 0; /* Failed to aquire the card! */ 265 + return 0; /* Failed to acquire the card! */ 266 266 } 267 267 268 268 static void unlock_card(struct isi_board *card)
+1 -1
drivers/media/video/bt8xx/bttvp.h
··· 360 360 int mbox_csel; 361 361 362 362 /* risc memory management data 363 - - must aquire s_lock before changing these 363 + - must acquire s_lock before changing these 364 364 - only the irq handler is supported to touch top + bottom + vcurr */ 365 365 struct btcx_riscmem main; 366 366 struct bttv_buffer *screen; /* overlay */
+1 -1
drivers/scsi/qla2xxx/qla_def.h
··· 2134 2134 mempool_t *srb_mempool; 2135 2135 2136 2136 /* This spinlock is used to protect "io transactions", you must 2137 - * aquire it before doing any IO to the card, eg with RD_REG*() and 2137 + * acquire it before doing any IO to the card, eg with RD_REG*() and 2138 2138 * WRT_REG*() for the duration of your entire commandtransaction. 2139 2139 * 2140 2140 * This spinlock is of lower priority than the io request lock.
+19 -19
fs/befs/linuxvfs.c
··· 325 325 if (!bh) { 326 326 befs_error(sb, "unable to read inode block - " 327 327 "inode = %lu", inode->i_ino); 328 - goto unaquire_none; 328 + goto unacquire_none; 329 329 } 330 330 331 331 raw_inode = (befs_inode *) bh->b_data; ··· 334 334 335 335 if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { 336 336 befs_error(sb, "Bad inode: %lu", inode->i_ino); 337 - goto unaquire_bh; 337 + goto unacquire_bh; 338 338 } 339 339 340 340 inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); ··· 402 402 befs_error(sb, "Inode %lu is not a regular file, " 403 403 "directory or symlink. THAT IS WRONG! BeFS has no " 404 404 "on disk special files", inode->i_ino); 405 - goto unaquire_bh; 405 + goto unacquire_bh; 406 406 } 407 407 408 408 brelse(bh); 409 409 befs_debug(sb, "<--- befs_read_inode()"); 410 410 return; 411 411 412 - unaquire_bh: 412 + unacquire_bh: 413 413 brelse(bh); 414 414 415 - unaquire_none: 415 + unacquire_none: 416 416 make_bad_inode(inode); 417 417 befs_debug(sb, "<--- befs_read_inode() - Bad inode"); 418 418 return; ··· 761 761 printk(KERN_ERR 762 762 "BeFS(%s): Unable to allocate memory for private " 763 763 "portion of superblock. Bailing.\n", sb->s_id); 764 - goto unaquire_none; 764 + goto unacquire_none; 765 765 } 766 766 befs_sb = BEFS_SB(sb); 767 767 memset(befs_sb, 0, sizeof(befs_sb_info)); 768 768 769 769 if (!parse_options((char *) data, &befs_sb->mount_opts)) { 770 770 befs_error(sb, "cannot parse mount options"); 771 - goto unaquire_priv_sbp; 771 + goto unacquire_priv_sbp; 772 772 } 773 773 774 774 befs_debug(sb, "---> befs_fill_super()"); ··· 794 794 795 795 if (!(bh = sb_bread(sb, sb_block))) { 796 796 befs_error(sb, "unable to read superblock"); 797 - goto unaquire_priv_sbp; 797 + goto unacquire_priv_sbp; 798 798 } 799 799 800 800 /* account for offset of super block on x86 */ ··· 809 809 } 810 810 811 811 if (befs_load_sb(sb, disk_sb) != BEFS_OK) 812 - goto unaquire_bh; 812 + goto unacquire_bh; 813 813 814 814 befs_dump_super_block(sb, disk_sb); 815 815 816 816 brelse(bh); 817 817 818 818 if (befs_check_sb(sb) != BEFS_OK) 819 - goto unaquire_priv_sbp; 819 + goto unacquire_priv_sbp; 820 820 821 821 if( befs_sb->num_blocks > ~((sector_t)0) ) { 822 822 befs_error(sb, "blocks count: %Lu " 823 823 "is larger than the host can use", 824 824 befs_sb->num_blocks); 825 - goto unaquire_priv_sbp; 825 + goto unacquire_priv_sbp; 826 826 } 827 827 828 828 /* ··· 838 838 if (!sb->s_root) { 839 839 iput(root); 840 840 befs_error(sb, "get root inode failed"); 841 - goto unaquire_priv_sbp; 841 + goto unacquire_priv_sbp; 842 842 } 843 843 844 844 /* load nls library */ ··· 860 860 861 861 return 0; 862 862 /*****************/ 863 - unaquire_bh: 863 + unacquire_bh: 864 864 brelse(bh); 865 865 866 - unaquire_priv_sbp: 866 + unacquire_priv_sbp: 867 867 kfree(sb->s_fs_info); 868 868 869 - unaquire_none: 869 + unacquire_none: 870 870 sb->s_fs_info = NULL; 871 871 return -EINVAL; 872 872 } ··· 925 925 926 926 err = befs_init_inodecache(); 927 927 if (err) 928 - goto unaquire_none; 928 + goto unacquire_none; 929 929 930 930 err = register_filesystem(&befs_fs_type); 931 931 if (err) 932 - goto unaquire_inodecache; 932 + goto unacquire_inodecache; 933 933 934 934 return 0; 935 935 936 - unaquire_inodecache: 936 + unacquire_inodecache: 937 937 befs_destroy_inodecache(); 938 938 939 - unaquire_none: 939 + unacquire_none: 940 940 return err; 941 941 } 942 942
+1 -1
fs/cifs/file.c
··· 324 324 return rc; 325 325 } 326 326 327 - /* Try to reaquire byte range locks that were released when session */ 327 + /* Try to reacquire byte range locks that were released when session */ 328 328 /* to server was lost */ 329 329 static int cifs_relock_file(struct cifsFileInfo *cifsFile) 330 330 {
+1 -1
fs/jfs/jfs_txnmgr.c
··· 842 842 TXN_UNLOCK(); 843 843 release_metapage(mp); 844 844 TXN_LOCK(); 845 - xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */ 845 + xtid = tlck->tid; /* reacquire after dropping TXN_LOCK */ 846 846 847 847 jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", 848 848 tid, xtid, lid);
+3 -3
sound/oss/dmabuf.c
··· 547 547 } 548 548 return 0; 549 549 } 550 - /* aquires lock */ 550 + /* acquires lock */ 551 551 int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) 552 552 { 553 553 struct audio_operations *adev = audio_devs[dev]; ··· 821 821 *size = len & ~SAMPLE_ROUNDUP; 822 822 return (*size > 0); 823 823 } 824 - /* aquires lock */ 824 + /* acquires lock */ 825 825 int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock) 826 826 { 827 827 struct audio_operations *adev = audio_devs[dev]; ··· 855 855 spin_unlock_irqrestore(&dmap->lock,flags); 856 856 return 0; 857 857 } 858 - /* has to aquire dmap->lock */ 858 + /* has to acquire dmap->lock */ 859 859 int DMAbuf_move_wrpointer(int dev, int l) 860 860 { 861 861 struct audio_operations *adev = audio_devs[dev];