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

[PATCH] merge some from Rusty's trivial patches

This patch contains the most trivial from Rusty's trivial patches:
- spelling fixes
- remove duplicate includes

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Adrian Bunk and committed by
Linus Torvalds
338cec32 f9101210

+10 -15
+1 -1
Documentation/mono.txt
··· 30 30 Read the file 'binfmt_misc.txt' in this directory to know 31 31 more about the configuration process. 32 32 33 - 3) Add the following enries to /etc/rc.local or similar script 33 + 3) Add the following entries to /etc/rc.local or similar script 34 34 to be run at system startup: 35 35 36 36 # Insert BINFMT_MISC module into the kernel
+1 -1
Documentation/pci.txt
··· 84 84 85 85 Most drivers don't need to use the driver_data field. Best practice 86 86 for use of driver_data is to use it as an index into a static list of 87 - equivalant device types, not to use it as a pointer. 87 + equivalent device types, not to use it as a pointer. 88 88 89 89 Have a table entry {PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID} 90 90 to have probe() called for every PCI device known to the system.
+1 -1
Documentation/sysrq.txt
··· 171 171 Next, you must create a sysrq_key_op struct, and populate it with A) the key 172 172 handler function you will use, B) a help_msg string, that will print when SysRQ 173 173 prints help, and C) an action_msg string, that will print right before your 174 - handler is called. Your handler must conform to the protoype in 'sysrq.h'. 174 + handler is called. Your handler must conform to the prototype in 'sysrq.h'. 175 175 176 176 After the sysrq_key_op is created, you can call the macro 177 177 register_sysrq_key(int key, struct sysrq_key_op *op_p) that is defined in
-1
arch/ppc/kernel/cpu_setup_6xx.S
··· 12 12 #include <linux/config.h> 13 13 #include <asm/processor.h> 14 14 #include <asm/page.h> 15 - #include <asm/ppc_asm.h> 16 15 #include <asm/cputable.h> 17 16 #include <asm/ppc_asm.h> 18 17 #include <asm/asm-offsets.h>
-1
arch/ppc/kernel/cpu_setup_power4.S
··· 14 14 #include <asm/page.h> 15 15 #include <asm/ppc_asm.h> 16 16 #include <asm/cputable.h> 17 - #include <asm/ppc_asm.h> 18 17 #include <asm/asm-offsets.h> 19 18 #include <asm/cache.h> 20 19
+1 -1
arch/ppc/kernel/dma-mapping.c
··· 393 393 * __dma_sync_page() implementation for systems using highmem. 394 394 * In this case, each page of a buffer must be kmapped/kunmapped 395 395 * in order to have a virtual address for __dma_sync(). This must 396 - * not sleep so kmap_atmomic()/kunmap_atomic() are used. 396 + * not sleep so kmap_atomic()/kunmap_atomic() are used. 397 397 * 398 398 * Note: yes, it is possible and correct to have a buffer extend 399 399 * beyond the first page.
-1
arch/ppc64/kernel/cpu_setup_power4.S
··· 12 12 #include <linux/config.h> 13 13 #include <asm/processor.h> 14 14 #include <asm/page.h> 15 - #include <asm/ppc_asm.h> 16 15 #include <asm/cputable.h> 17 16 #include <asm/ppc_asm.h> 18 17 #include <asm/asm-offsets.h>
+3 -3
drivers/ide/ide-io.c
··· 560 560 EXPORT_SYMBOL_GPL(__ide_abort); 561 561 562 562 /** 563 - * ide_abort - abort pending IDE operatins 563 + * ide_abort - abort pending IDE operations 564 564 * @drive: drive the error occurred on 565 565 * @msg: message to report 566 566 * ··· 623 623 * @drive: drive the completion interrupt occurred on 624 624 * 625 625 * drive_cmd_intr() is invoked on completion of a special DRIVE_CMD. 626 - * We do any necessary daya reading and then wait for the drive to 626 + * We do any necessary data reading and then wait for the drive to 627 627 * go non busy. At that point we may read the error data and complete 628 628 * the request 629 629 */ ··· 773 773 774 774 /** 775 775 * execute_drive_command - issue special drive command 776 - * @drive: the drive to issue th command on 776 + * @drive: the drive to issue the command on 777 777 * @rq: the request structure holding the command 778 778 * 779 779 * execute_drive_cmd() issues a special drive command, usually
+2 -2
drivers/md/md.c
··· 74 74 * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit' 75 75 * is 1000 KB/sec, so the extra system load does not show up that much. 76 76 * Increase it if you want to have more _guaranteed_ speed. Note that 77 - * the RAID driver will use the maximum available bandwith if the IO 77 + * the RAID driver will use the maximum available bandwidth if the IO 78 78 * subsystem is idle. There is also an 'absolute maximum' reconstruction 79 79 * speed limit - in case reconstruction slows down your system despite 80 80 * idle IO detection. ··· 3616 3616 printk(KERN_INFO "md: syncing RAID array %s\n", mdname(mddev)); 3617 3617 printk(KERN_INFO "md: minimum _guaranteed_ reconstruction speed:" 3618 3618 " %d KB/sec/disc.\n", sysctl_speed_limit_min); 3619 - printk(KERN_INFO "md: using maximum available idle IO bandwith " 3619 + printk(KERN_INFO "md: using maximum available idle IO bandwidth " 3620 3620 "(but not more than %d KB/sec) for reconstruction.\n", 3621 3621 sysctl_speed_limit_max); 3622 3622
-1
drivers/parisc/lasi.c
··· 20 20 #include <linux/slab.h> 21 21 #include <linux/module.h> 22 22 #include <linux/pm.h> 23 - #include <linux/slab.h> 24 23 #include <linux/types.h> 25 24 26 25 #include <asm/io.h>
-1
drivers/scsi/ibmmca.c
··· 36 36 #include <linux/proc_fs.h> 37 37 #include <linux/stat.h> 38 38 #include <linux/mca.h> 39 - #include <linux/string.h> 40 39 #include <linux/spinlock.h> 41 40 #include <linux/init.h> 42 41 #include <linux/mca-legacy.h>
+1 -1
ipc/mqueue.c
··· 69 69 70 70 struct sigevent notify; 71 71 pid_t notify_owner; 72 - struct user_struct *user; /* user who created, for accouting */ 72 + struct user_struct *user; /* user who created, for accounting */ 73 73 struct sock *notify_sock; 74 74 struct sk_buff *notify_cookie; 75 75