diff options
52 files changed, 61 insertions, 62 deletions
diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt index 1d8dccf04e7..028614cdd06 100644 --- a/Documentation/DMA-mapping.txt +++ b/Documentation/DMA-mapping.txt @@ -107,7 +107,7 @@ The query is performed via a call to pci_set_dma_mask(): int pci_set_dma_mask(struct pci_dev *pdev, u64 device_mask); -The query for consistent allocations is performed via a a call to +The query for consistent allocations is performed via a call to pci_set_consistent_dma_mask(): int pci_set_consistent_dma_mask(struct pci_dev *pdev, u64 device_mask); diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index 065e8dc23e3..c684abf0d3b 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl @@ -1400,7 +1400,7 @@ and other resources, etc. <listitem> <para> When it's known that HBA is in ready state but ATA/ATAPI - device in in unknown state, reset only device. + device is in unknown state, reset only device. </para> </listitem> diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl index fbc72d4dbc2..143e5ff7deb 100644 --- a/Documentation/DocBook/usb.tmpl +++ b/Documentation/DocBook/usb.tmpl @@ -740,7 +740,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param) <title>Synchronous I/O Support</title> <para>Synchronous requests involve the kernel blocking - until until the user mode request completes, either by + until the user mode request completes, either by finishing successfully or by reporting an error. In most cases this is the simplest way to use usbfs, although as noted above it does prevent performing I/O diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt index f8092a891dd..820fee23696 100644 --- a/Documentation/RCU/whatisRCU.txt +++ b/Documentation/RCU/whatisRCU.txt @@ -750,7 +750,7 @@ Or, for those who prefer a side-by-side listing: Either way, the differences are quite small. Read-side locking moves to rcu_read_lock() and rcu_read_unlock, update-side locking moves from -from a reader-writer lock to a simple spinlock, and a synchronize_rcu() +a reader-writer lock to a simple spinlock, and a synchronize_rcu() precedes the kfree(). However, there is one potential catch: the read-side and update-side diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index e2f7dc6069c..34bf8f60d8f 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt @@ -135,7 +135,7 @@ Some new queue property settings: Sets two variables that limit the size of the request. - The request queue's max_sectors, which is a soft size in - in units of 512 byte sectors, and could be dynamically varied + units of 512 byte sectors, and could be dynamically varied by the core kernel. - The request queue's max_hw_sectors, which is a hard limit diff --git a/Documentation/driver-model/overview.txt b/Documentation/driver-model/overview.txt index 2050c9ffc62..07236ed968d 100644 --- a/Documentation/driver-model/overview.txt +++ b/Documentation/driver-model/overview.txt @@ -57,7 +57,7 @@ the two. The PCI bus layer freely accesses the fields of struct device. It knows about the structure of struct pci_dev, and it should know the structure of struct -device. Individual PCI device drivers that have been converted the the current +device. Individual PCI device drivers that have been converted to the current driver model generally do not and should not touch the fields of struct device, unless there is a strong compelling reason to do so. diff --git a/Documentation/exception.txt b/Documentation/exception.txt index 3cb39ade290..2d5aded6424 100644 --- a/Documentation/exception.txt +++ b/Documentation/exception.txt @@ -10,7 +10,7 @@ int verify_area(int type, const void * addr, unsigned long size) function (which has since been replaced by access_ok()). This function verified that the memory area starting at address -addr and of size size was accessible for the operation specified +'addr' and of size 'size' was accessible for the operation specified in type (read or write). To do this, verify_read had to look up the virtual memory area (vma) that contained the address addr. In the normal case (correctly working program), this test was successful. diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt index f373df12ed4..99ea58e65ef 100644 --- a/Documentation/fb/fbcon.txt +++ b/Documentation/fb/fbcon.txt @@ -163,7 +163,7 @@ from the console layer before unloading the driver. The VGA driver cannot be unloaded if it is still bound to the console layer. (See Documentation/console/console.txt for more information). -This is more complicated in the case of the the framebuffer console (fbcon), +This is more complicated in the case of the framebuffer console (fbcon), because fbcon is an intermediate layer between the console and the drivers: console ---> fbcon ---> fbdev drivers ---> hardware diff --git a/Documentation/filesystems/directory-locking b/Documentation/filesystems/directory-locking index 34380d4fbce..d7099a9266f 100644 --- a/Documentation/filesystems/directory-locking +++ b/Documentation/filesystems/directory-locking @@ -82,7 +82,7 @@ own descendent. Moreover, there is exactly one cross-directory rename Consider the object blocking the cross-directory rename. One of its descendents is locked by cross-directory rename (otherwise we -would again have an infinite set of of contended objects). But that +would again have an infinite set of contended objects). But that means that cross-directory rename is taking locks out of order. Due to (2) the order hadn't changed since we had acquired filesystem lock. But locking rules for cross-directory rename guarantee that we do not diff --git a/Documentation/filesystems/files.txt b/Documentation/filesystems/files.txt index 8c206f4e025..133e213ebb7 100644 --- a/Documentation/filesystems/files.txt +++ b/Documentation/filesystems/files.txt @@ -55,7 +55,7 @@ the fdtable structure - 2. Reading of the fdtable as described above must be protected by rcu_read_lock()/rcu_read_unlock(). -3. For any update to the the fd table, files->file_lock must +3. For any update to the fd table, files->file_lock must be held. 4. To look up the file structure given an fd, a reader diff --git a/Documentation/filesystems/spufs.txt b/Documentation/filesystems/spufs.txt index 3889a806624..982645a1981 100644 --- a/Documentation/filesystems/spufs.txt +++ b/Documentation/filesystems/spufs.txt @@ -105,7 +105,7 @@ FILES /wbox - The CPU to SPU communation mailbox. It is write-only can can be written + The CPU to SPU communation mailbox. It is write-only and can be written in units of 32 bits. If the mailbox is full, write() will block and poll can be used to wait for it becoming empty again. The possible operations on an open wbox file are: write(2) If a count smaller than diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index f9bcf9f4934..6dd050878a2 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt @@ -63,7 +63,7 @@ size: The limit of allocated bytes for this tmpfs instance. The nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE. nr_inodes: The maximum number of inodes for this instance. The default is half of the number of your physical RAM pages, or (on a - a machine with highmem) the number of lowmem RAM pages, + machine with highmem) the number of lowmem RAM pages, whichever is the lower. These parameters accept a suffix k, m or g for kilo, mega and giga and diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt index 2001abbc60e..069cb109430 100644 --- a/Documentation/filesystems/vfat.txt +++ b/Documentation/filesystems/vfat.txt @@ -35,7 +35,7 @@ iocharset=name -- Character set to use for converting between the you should consider the following option instead. utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that - is used by the console. It can be be enabled for the + is used by the console. It can be enabled for the filesystem with this option. If 'uni_xlate' gets set, UTF-8 gets disabled. diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index cd07c21b840..7737bfd03cf 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -410,7 +410,7 @@ otherwise noted. put_link: called by the VFS to release resources allocated by follow_link(). The cookie returned by follow_link() is passed - to to this method as the last parameter. It is used by + to this method as the last parameter. It is used by filesystems such as NFS where page cache is not stable (i.e. page that was installed when the symbolic link walk started might not be in the page cache at the end of the diff --git a/Documentation/fujitsu/frv/mmu-layout.txt b/Documentation/fujitsu/frv/mmu-layout.txt index 11dcc567988..db10250df6b 100644 --- a/Documentation/fujitsu/frv/mmu-layout.txt +++ b/Documentation/fujitsu/frv/mmu-layout.txt @@ -233,7 +233,7 @@ related kernel services: (*) __debug_mmu.iamr[] (*) __debug_mmu.damr[] - These receive the current IAMR and DAMR contents. These can be viewed with with the _amr + These receive the current IAMR and DAMR contents. These can be viewed with the _amr GDB macro: (gdb) _amr diff --git a/Documentation/ia64/efirtc.txt b/Documentation/ia64/efirtc.txt index ede2c1e51cd..057e6bebda8 100644 --- a/Documentation/ia64/efirtc.txt +++ b/Documentation/ia64/efirtc.txt @@ -26,7 +26,7 @@ to initialize the system view of the time during boot. Because we wanted to minimize the impact on existing user-level apps using the CMOS clock, we decided to expose an API that was very similar to the one used today with the legacy RTC driver (driver/char/rtc.c). However, because -EFI provides a simpler services, not all all ioctl() are available. Also +EFI provides a simpler services, not all ioctl() are available. Also new ioctl()s have been introduced for things that EFI provides but not the legacy. diff --git a/Documentation/ia64/mca.txt b/Documentation/ia64/mca.txt index a71cc6a67ef..f097c60cba1 100644 --- a/Documentation/ia64/mca.txt +++ b/Documentation/ia64/mca.txt @@ -12,7 +12,7 @@ by locks is indeterminate, including linked lists. --- The complicated ia64 MCA process. All of this is mandated by Intel's -specification for ia64 SAL, error recovery and and unwind, it is not as +specification for ia64 SAL, error recovery and unwind, it is not as if we have a choice here. * MCA occurs on one cpu, usually due to a double bit memory error. @@ -94,7 +94,7 @@ if we have a choice here. INIT is less complicated than MCA. Pressing the nmi button or using the equivalent command on the management console sends INIT to all -cpus. SAL picks one one of the cpus as the monarch and the rest are +cpus. SAL picks one of the cpus as the monarch and the rest are slaves. All the OS INIT handlers are entered at approximately the same time. The OS monarch prints the state of all tasks and returns, after which the slaves return and the system resumes. diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index fabb8235c27..ff8cea0225f 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt @@ -230,7 +230,7 @@ generated in the kernel straight to the program, with timestamps. The API is still evolving, but should be useable now. It's described in section 5. - This should be the way for GPM and X to get keyboard and mouse mouse + This should be the way for GPM and X to get keyboard and mouse events. It allows for multihead in X without any specific multihead kernel support. The event codes are the same on all architectures and are hardware independent. diff --git a/Documentation/isdn/INTERFACE.fax b/Documentation/isdn/INTERFACE.fax index 7e5731319e3..9c8c6d914ec 100644 --- a/Documentation/isdn/INTERFACE.fax +++ b/Documentation/isdn/INTERFACE.fax @@ -26,7 +26,7 @@ Structure T30_s description: If the HL-driver receives ISDN_CMD_FAXCMD, all needed information is in this struct set by the LL. To signal information to the LL, the HL-driver has to set the - the parameters and use ISDN_STAT_FAXIND. + parameters and use ISDN_STAT_FAXIND. (Please refer to INTERFACE) Structure T30_s: diff --git a/Documentation/isdn/README.hysdn b/Documentation/isdn/README.hysdn index 56cc59df1fb..eeca11f00cc 100644 --- a/Documentation/isdn/README.hysdn +++ b/Documentation/isdn/README.hysdn @@ -1,6 +1,6 @@ $Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $ The hysdn driver has been written by -by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) +Werner Cornelius (werner@isdn4linux.de or werner@titro.de) for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver under the GNU General Public License. diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt index 08bafa8c1ca..99f2d4d4bf7 100644 --- a/Documentation/kdump/kdump.txt +++ b/Documentation/kdump/kdump.txt @@ -249,7 +249,7 @@ If die() is called, and it happens to be a thread with pid 0 or 1, or die() is called inside interrupt context or die() is called and panic_on_oops is set, the system will boot into the dump-capture kernel. -On powererpc systems when a soft-reset is generated, die() is called by all cpus and the system system will boot into the dump-capture kernel. +On powererpc systems when a soft-reset is generated, die() is called by all cpus and the system will boot into the dump-capture kernel. For testing purposes, you can trigger a crash by using "ALT-SysRq-c", "echo c > /proc/sysrq-trigger or write a module to force the panic. diff --git a/Documentation/keys.txt b/Documentation/keys.txt index 693ef0c63b9..3da586bc785 100644 --- a/Documentation/keys.txt +++ b/Documentation/keys.txt @@ -671,7 +671,7 @@ The keyctl syscall functions are: Note that this setting is inherited across fork/exec. - [1] The default default is: the thread keyring if there is one, otherwise + [1] The default is: the thread keyring if there is one, otherwise the process keyring if there is one, otherwise the session keyring if there is one, otherwise the user default session keyring. diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt index d5d3f064f55..1c41db21d3c 100644 --- a/Documentation/m68k/kernel-options.txt +++ b/Documentation/m68k/kernel-options.txt @@ -415,7 +415,7 @@ switch to another mode once Linux has started. The first 3 parameters of this sub-option should be obvious: <xres>, <yres> and <depth> give the dimensions of the screen and the number of -planes (depth). The depth is is the logarithm to base 2 of the number +planes (depth). The depth is the logarithm to base 2 of the number of colors possible. (Or, the other way round: The number of colors is 2^depth). diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index a60f3ce474e..994355b0cd1 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt @@ -670,7 +670,7 @@ effectively random order, despite the write barrier issued by CPU 1: In the above example, CPU 2 perceives that B is 7, despite the load of *C -(which would be B) coming after the the LOAD of C. +(which would be B) coming after the LOAD of C. If, however, a data dependency barrier were to be placed between the load of C and the load of *C (ie: B) on CPU 2: diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index dc942eaf490..de809e58092 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt @@ -1023,7 +1023,7 @@ Changing a Bond's Configuration files located in /sys/class/net/<bond name>/bonding The names of these files correspond directly with the command- -line parameters described elsewhere in in this file, and, with the +line parameters described elsewhere in this file, and, with the exception of arp_ip_target, they accept the same values. To see the current setting, simply cat the appropriate file. diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt index f1f9e8afe1e..64896470e27 100644 --- a/Documentation/networking/cs89x0.txt +++ b/Documentation/networking/cs89x0.txt @@ -684,7 +684,7 @@ ethernet@crystal.cirrus.com) and request that you be registered for automatic software-update notification. Cirrus Logic maintains a web page at http://www.cirrus.com with the -the latest drivers and technical publications. +latest drivers and technical publications. 6.4 Current maintainer diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt index e6c39c5831f..badb7480ea6 100644 --- a/Documentation/networking/decnet.txt +++ b/Documentation/networking/decnet.txt @@ -82,7 +82,7 @@ ethernet address of your ethernet card has to be set according to the DECnet address of the node in order for it to be autoconfigured (and then appear in /proc/net/decnet_dev). There is a utility available at the above FTP sites called dn2ethaddr which can compute the correct ethernet -address to use. The address can be set by ifconfig either before at +address to use. The address can be set by ifconfig either before or at the time the device is brought up. If you are using RedHat you can add the line: diff --git a/Documentation/networking/e1000.txt b/Documentation/networking/e1000.txt index 71fe15af356..5c0a5cc0399 100644 --- a/Documentation/networking/e1000.txt +++ b/Documentation/networking/e1000.txt @@ -350,7 +350,7 @@ Additional Configurations As an example, if you install the e1000 driver for two PRO/1000 adapters (eth0 and eth1) and set the speed and duplex to 10full and 100half, add - the following to modules.conf or or modprobe.conf: + the following to modules.conf or modprobe.conf: alias eth0 e1000 alias eth1 e1000 diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt index bd528ffbeb4..4bde53e85f3 100644 --- a/Documentation/networking/s2io.txt +++ b/Documentation/networking/s2io.txt @@ -126,7 +126,7 @@ However, you may want to set PCI latency timer to 248. #setpci -d 17d5:* LATENCY_TIMER=f8 For detailed description of the PCI registers, please see Xframe User Guide. b. Use 2-buffer mode. This results in large performance boost on -on certain platforms(eg. SGI Altix, IBM xSeries). +certain platforms(eg. SGI Altix, IBM xSeries). c. Ensure Receive Checksum offload is enabled. Use "ethtool -K ethX" command to set/verify this option. d. Enable NAPI feature(in kernel configuration Device Drivers ---> Network diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 82ce5547db4..4e1cc745ec6 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt @@ -497,7 +497,7 @@ Solution: In /proc/pci search for the following entry: www.syskonnect.com Some COMPAQ machines have problems dealing with PCI under Linux. - Linux. This problem is described in the 'PCI howto' document + This problem is described in the 'PCI howto' document (included in some distributions or available from the web, e.g. at 'www.linux.org'). diff --git a/Documentation/pci-error-recovery.txt b/Documentation/pci-error-recovery.txt index 634d3e5b575..6650af43252 100644 --- a/Documentation/pci-error-recovery.txt +++ b/Documentation/pci-error-recovery.txt @@ -172,7 +172,7 @@ is STEP 6 (Permanent Failure). >>> a value of 0xff on read, and writes will be dropped. If the device >>> driver attempts more than 10K I/O's to a frozen adapter, it will >>> assume that the device driver has gone into an infinite loop, and ->>> it will panic the the kernel. There doesn't seem to be any other +>>> it will panic the kernel. There doesn't seem to be any other >>> way of stopping a device driver that insists on spinning on I/O. STEP 2: MMIO Enabled diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index a99c176c31d..9ea2208b43b 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt @@ -156,7 +156,7 @@ instead set the PF_NOFREEZE process flag when creating the thread (and be very carefull). -Q: What is the difference between between "platform", "shutdown" and +Q: What is the difference between "platform", "shutdown" and "firmware" in /sys/power/disk? A: diff --git a/Documentation/prio_tree.txt b/Documentation/prio_tree.txt index 2fbb0c49bc5..3aa68f9a117 100644 --- a/Documentation/prio_tree.txt +++ b/Documentation/prio_tree.txt @@ -88,7 +88,7 @@ path which is not desirable. Hence, we do not optimize the height of the heap-and-size indexed overflow-sub-trees using prio_tree->index_bits. Instead the overflow sub-trees are indexed using full BITS_PER_LONG bits of size_index. This may lead to skewed sub-trees because most of the -higher significant bits of the size_index are likely to be be 0 (zero). In +higher significant bits of the size_index are likely to be 0 (zero). In the example above, all 3 overflow-sub-trees are skewed. This may marginally affect the performance. However, processes rarely map many vmas with the same start_vm_pgoff but different end_vm_pgoffs. Therefore, we normally diff --git a/Documentation/rpc-cache.txt b/Documentation/rpc-cache.txt index 21fb09ce4cf..8a382bea680 100644 --- a/Documentation/rpc-cache.txt +++ b/Documentation/rpc-cache.txt @@ -53,7 +53,7 @@ Creating a Cache structure void cache_put(struct kref *) This is called when the last reference to an item is - is dropped. The pointer passed is to the 'ref' field + dropped. The pointer passed is to the 'ref' field in the cache_head. cache_put should release any references create by 'cache_init' and, if CACHE_VALID is set, any references created by cache_update. diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index c051ba27670..4dd25ee549e 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt @@ -1085,8 +1085,7 @@ Notes ----- Addresse |