please pull from the trivial tree
Subsystems (20)
Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
This tree contains the following:
Adrian Bunk:
help text: SOFTWARE_SUSPEND doesn't need ACPI fix a typo in the AIC7XXX_DEBUG_MASK help text fix the email address of Wendy Xiong
typos: s/ducument/document/
Anders Larsen:
MTD: remove obsolete Kconfig options
Cal Peake:
BFP->BPF in Documentation/networking/tuntap.txt
Eric Sesterhenn:
BUG_ON() Conversion in md/dm-target.c BUG_ON() Conversion in md/raid1.c
BUG_ON() Conversion in fs/direct-io.c BUG_ON() Conversion in fs/exec.c
BUG_ON() Conversion in fs/hfsplus/
BUG_ON() Conversion in fs/jffs2/
BUG_ON() Conversion in fs/smbfs/
BUG_ON() Conversion in fs/sysfs/
BUG_ON() Conversion in ipc/util.c
BUG_ON() Conversion in kernel/printk.c BUG_ON() Conversion in mm/mmap.c
BUG_ON() Conversion in mm/swap_state.c BUG_ON() Conversion in mm/vmalloc.c
BUG_ON() Conversion in drivers/s390/block/dasd_erp.c BUG_ON() Conversion in drivers/s390/char/tape_block.c
Horms:
Documentation: Reorder documentation of nomca and nomce
Documentation: Make fujitsu/frv/kernel-ABI.txt 80 columns wide
kexec: grammar fix for crash_save_this_cpu()
Kalin KOZHUHAROV:
Fix comments: s/granuality/granularity/
Michael Hayes:
Fix minor documentation typo
Stefan Richter:
Doc/kernel-parameters.txt: delete false version information and history Doc/kernel-parameters.txt: mention modinfo and sysfs Doc/kernel-parameters.txt: slightly reword sentence about restrictions
Uwe Zeisberger:
fix typo "Suposse" -> "Suppose"
Documentation/DocBook/Makefile | 2 Documentation/acpi-hotkey.txt | 2 Documentation/fujitsu/frv/kernel-ABI.txt | 196 +++++++++++++---------- Documentation/kernel-parameters.txt | 34 +-- Documentation/networking/packet_mmap.txt | 2 Documentation/networking/tuntap.txt | 2 arch/i386/kernel/crash.c | 2 drivers/md/dm-target.c | 3 drivers/md/raid1.c | 6 drivers/mtd/chips/Kconfig | 21 -- drivers/s390/block/dasd_erp.c | 8 drivers/s390/char/sclp_rw.c | 2 drivers/s390/char/tape_block.c | 13 - drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 drivers/serial/jsm/jsm.h | 2 drivers/serial/jsm/jsm_driver.c | 2 drivers/serial/jsm/jsm_neo.c | 2 fs/direct-io.c | 3 fs/exec.c | 2 fs/hfsplus/bnode.c | 6 fs/hfsplus/btree.c | 3 fs/jffs2/background.c | 3 fs/smbfs/file.c | 6 fs/sysfs/inode.c | 3 include/linux/fs.h | 2 ipc/util.c | 6 kernel/power/Kconfig | 2 kernel/printk.c | 6 kernel/time.c | 8 mm/mmap.c | 9 - mm/swap_state.c | 3 mm/vmalloc.c | 3 32 files changed, 170 insertions(+), 196 deletions(-)
Documentation/DocBook/Makefile +1 -1
@@ -2,7 +2,7 @@ # This makefile is used to generate the kernel documentation, # primarily based on in-line comments in various source files. # See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how -# to ducument the SRC - and how to read it. +# to document the SRC - and how to read it. # To add a new book the only step required is to add the book to the # list of DOCBOOKS.
Documentation/acpi-hotkey.txt +1 -1
@@ -30,7 +30,7 @@ specific hotkey(event)) echo "event_num:event_type:event_argument" > /proc/acpi/hotkey/action. The result of the execution of this aml method is -attached to /proc/acpi/hotkey/poll_method, which is dnyamically +attached to /proc/acpi/hotkey/poll_method, which is dynamically created. Please use command "cat /proc/acpi/hotkey/polling_method" to retrieve it.
Documentation/fujitsu/frv/kernel-ABI.txt +112 -84
308 lines not on this page · raw message
Documentation/kernel-parameters.txt +14 -20
@@ -1,4 +1,4 @@ -February 2003 Kernel Parameters v2.5.59 + Kernel Parameters ~~~~~~~~~~~~~~~~~ The following is a consolidated list of the kernel parameters as implemented
@@ -17,9 +17,17 @@ are specified on the kernel command line usbcore.blinkenlights=1 -The text in square brackets at the beginning of the description states the -restrictions on the kernel for the said kernel parameter to be valid. The -restrictions referred to are that the relevant option is valid if: +This document may not be entirely up to date and comprehensive. The command +"modinfo -p ${modulename}" shows a current list of all parameters of a loadable +module. Loadable modules, after being loaded into the running kernel, also +reveal their parameters in /sys/module/${modulename}/parameters/. Some of these +parameters may be changed at runtime by the command +"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}". + +The parameters listed below are only valid if certain kernel build options were +enabled and if respective hardware is present. The text in square brackets at +the beginning of each description states the restrictions within which a +parameter is applicable: ACPI ACPI support is enabled. ALSA ALSA sound support is enabled.
@@ -1046,10 +1054,10 @@ running once the system is up. noltlbs [PPC] Do not use large page/tlb entries for kernel lowmem mapping on PPC40x. - nomce [IA-32] Machine Check Exception - nomca [IA-64] Disable machine check abort handling + nomce [IA-32] Machine Check Exception + noresidual [PPC] Don't use residual data on PReP machines. noresume [SWSUSP] Disables resume and restores original swap
@@ -1682,20 +1690,6 @@ running once the system is up. ______________________________________________________________________ -Changelog: - -2000-06-?? Mr. Unknown - The last known update (for 2.4.0) - the changelog was not kept before. - -2002-11-24 Petr Baudis <[email protected]> - Randy Dunlap <[email protected]> - Update for 2.5.49, description for most of the options introduced, - references to other documentation (C files, READMEs, ..), added S390, - PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and - reformatting. - -2005-10-19 Randy Dunlap <[email protected]> - Lots of typos, whitespace, some reformatting. TODO:
Documentation/networking/packet_mmap.txt +1 -1
@@ -254,7 +254,7 @@ and, the number of frames be <block number> * <block size> / <frame size> -Suposse the following parameters, which apply for 2.6 kernel and an +Suppose the following parameters, which apply for 2.6 kernel and an i386 architecture: <size-max> = 131072 bytes
Documentation/networking/tuntap.txt +1 -1
@@ -138,7 +138,7 @@ This means that you have to read/write I ethernet frames when using tap. 5. What is the difference between BPF and TUN/TAP driver? -BFP is an advanced packet filter. It can be attached to existing +BPF is an advanced packet filter. It can be attached to existing network interface. It does not provide a virtual network interface. A TUN/TAP driver does provide a virtual network interface and it is possible to attach BPF to this interface.
arch/i386/kernel/crash.c +1 -1
@@ -69,7 +69,7 @@ static void crash_save_this_cpu(struct p* for the data I pass, and I need tags * on the data to indicate what information I have * squirrelled away. ELF notes happen to provide -* all of that that no need to invent something new. +* all of that, so there is no need to invent something new. */ buf = (u32 *)per_cpu_ptr (crash_notes, cpu);if (!buf)
drivers/md/dm-target.c +1 -2
@@ -78,8 +78,7 @@ void dm_put_target_type(struct target_tyif (--ti->use ==0 )module_put (ti->tt.module); -if (ti->use <0 ) -BUG (); +BUG_ON (ti->use <0 );up_read (&_lock);return ;
drivers/md/raid1.c +2 -4
@@ -1558,8 +1558,7 @@ static int init_resync(conf_t *conf)int buffs; buffs =RESYNC_WINDOW /RESYNC_BLOCK_SIZE ; -if (conf->r1buf_pool) -BUG (); +BUG_ON (conf->r1buf_pool); conf->r1buf_pool =mempool_create (buffs, r1buf_pool_alloc, r1buf_pool_free, conf->poolinfo);if (!conf->r1buf_pool)
@@ -1732,8 +1731,7 @@ static sector_t sync_request(mddev_t *md !conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) break; -if (sync_blocks < (PAGE_SIZE >>9 )) -BUG (); +BUG_ON (sync_blocks < (PAGE_SIZE >>9 ));if (len > (sync_blocks<<9 )) len = sync_blocks<<9 ; }
drivers/mtd/chips/Kconfig +0 -21
@@ -200,27 +200,6 @@ config MTD_CFI_AMDSTD provides support for one of those command sets, used on chips including the AMD Am29LV320. -config MTD_CFI_AMDSTD_RETRY - int "Retry failed commands (erase/program)" - depends on MTD_CFI_AMDSTD - default "0" - help - Some chips, when attached to a shared bus, don't properly filter - bus traffic that is destined to other devices. This broken - behavior causes erase and program sequences to be aborted when - the sequences are mixed with traffic for other devices. - - SST49LF040 (and related) chips are know to be broken. - -config MTD_CFI_AMDSTD_RETRY_MAX - int "Max retries of failed commands (erase/program)" - depends on MTD_CFI_AMDSTD_RETRY - default "0" - help - If you have an SST49LF040 (or related chip) then this value should - be set to at least 1. This can also be adjusted at driver load - time with the retry_cmd_max module parameter. - config MTD_CFI_STAA tristate "Support for ST (Advanced Architecture) flash chips" depends on MTD_GEN_PROBE
drivers/s390/block/dasd_erp.c +3 -5
@@ -32,9 +32,8 @@ dasd_alloc_erp_request(char *magic, intint size;/* Sanity checks */ -if ( magic ==NULL || datasize >PAGE_SIZE || - (cplength*sizeof (struct ccw1 )) >PAGE_SIZE ) -BUG (); +BUG_ON ( magic ==NULL || datasize >PAGE_SIZE || + (cplength*sizeof (struct ccw1 )) >PAGE_SIZE ); size = (sizeof (struct dasd_ccw_req ) +7L ) &-8L ;if (cplength >0 )
@@ -125,8 +124,7 @@ dasd_default_erp_postaction(struct dasd_struct dasd_device *device;int success; -if (cqr->refers ==NULL || cqr->function ==NULL ) -BUG (); +BUG_ON (cqr->refers ==NULL || cqr->function ==NULL ); device = cqr->device; success = cqr->status ==DASD_CQR_DONE ;
drivers/s390/char/sclp_rw.c +1 -1
@@ -24,7 +24,7 @@/* * The room for the SCCB (only for writing) is not equal to a pages size -* (as it is specified as the maximum size in the the SCLP ducumentation) +* (as it is specified as the maximum size in the the SCLP documentation) * because of the additional data structure described above. */ #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer))
drivers/s390/char/tape_block.c +4 -9
@@ -198,9 +198,7 @@ tapeblock_request_fn(request_queue_t *qu device = (struct tape_device *) queue->queuedata;DBF_LH (6 ,"tapeblock_request_fn(device=%p)\n" , device); -if (device ==NULL ) -BUG (); - +BUG_ON (device ==NULL );tapeblock_trigger_requeue (device); }
@@ -307,8 +305,7 @@ tapeblock_revalidate_disk(struct gendiskint rc; device = (struct tape_device *) disk->private_data; -if (!device) -BUG (); +BUG_ON (!device);if (!device->blk_data.medium_changed)return 0 ;
@@ -440,11 +437,9 @@ tapeblock_ioctl( rc =0 ; disk = inode->i_bdev->bd_disk; -if (!disk) -BUG (); +BUG_ON (!disk); device = disk->private_data; -if (!device) -BUG (); +BUG_ON (!device); minor =iminor (inode);DBF_LH (6 ,"tapeblock_ioctl(0x%0x)\n" , command);
drivers/scsi/aic7xxx/Kconfig.aic7xxx +1 -1
@@ -86,7 +86,7 @@ config AIC7XXX_DEBUG_MASK default "0" help Bit mask of debug options that is only valid if the - CONFIG_AIC7XXX_DEBUG_ENBLE option is enabled. The bits in this mask + CONFIG_AIC7XXX_DEBUG_ENABLE option is enabled. The bits in this mask are defined in the drivers/scsi/aic7xxx/aic7xxx.h - search for the variable ahc_debug in that file to find them.
drivers/serial/jsm/jsm.h +1 -1
@@ -20,7 +20,7 @@* * Contact Information: * Scott H Kilau <[email protected]> -* Wendy Xiong <[email protected]> +* Wendy Xiong <[email protected]> * ***********************************************************************/
drivers/serial/jsm/jsm_driver.c +1 -1
@@ -20,7 +20,7 @@* * Contact Information: * Scott H Kilau <[email protected]> -* Wendy Xiong <[email protected]> +* Wendy Xiong <[email protected]> * * ***********************************************************************/
drivers/serial/jsm/jsm_neo.c +1 -1
@@ -20,7 +20,7 @@* * Contact Information: * Scott H Kilau <[email protected]> -* Wendy Xiong <[email protected]> +* Wendy Xiong <[email protected]> * ***********************************************************************/ #include <linux/delay.h> /* For udelay */
fs/direct-io.c +1 -2
@@ -929,8 +929,7 @@ do_holes: block_in_page += this_chunk_blocks; dio->blocks_available -= this_chunk_blocks; next_block: -if (dio->block_in_file > dio->final_block_in_request) -BUG (); +BUG_ON (dio->block_in_file > dio->final_block_in_request);if (dio->block_in_file == dio->final_block_in_request)break ; }
fs/exec.c +1 -1
@@ -561,7 +561,7 @@ static int exec_mmap(struct mm_struct *march_pick_mmap_layout (mm);if (old_mm) {up_read (&old_mm->mmap_sem); -if (active_mm != old_mm)BUG (); +BUG_ON (active_mm != old_mm);mmput (old_mm);return 0 ; }
fs/hfsplus/bnode.c +2 -4
@@ -466,8 +466,7 @@ void hfs_bnode_unhash(struct hfs_bnode *for (p = &node->tree->node_hash[hfs_bnode_hash (node->this)]; *p && *p != node; p = &(*p)->next_hash) ; -if (!*p) -BUG (); +BUG_ON (!*p); *p = node->next_hash; node->tree->node_hash_cnt--; }
@@ -622,8 +621,7 @@ void hfs_bnode_put(struct hfs_bnode *noddprint (DBG_BNODE_REFS ,"put_node(%d:%d): %d\n" , node->tree->cnid, node->this,atomic_read (&node->refcnt)); -if (!atomic_read (&node->refcnt)) -BUG (); +BUG_ON (!atomic_read (&node->refcnt));if (!atomic_dec_and_lock (&node->refcnt, &tree->hash_lock))return ;for (i =0 ; i < tree->pages_per_bnode; i++) {
fs/hfsplus/btree.c +1 -2
@@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *nodu8 *data, byte, m;dprint (DBG_BNODE_MOD ,"btree_free_node: %u\n" , node->this); -if (!node->this) -BUG (); +BUG_ON (!node->this); tree = node->tree; nidx = node->this; node =hfs_bnode_find (tree,0 );
fs/jffs2/background.c +1 -2
@@ -35,8 +35,7 @@ int jffs2_start_garbage_collect_thread(spid_t pid;int ret =0 ; -if (c->gc_task) -BUG (); +BUG_ON (c->gc_task);init_completion (&c->gc_thread_start);init_completion (&c->gc_thread_exit);
fs/smbfs/file.c +2 -4
@@ -178,11 +178,9 @@ smb_writepage(struct page *page, structunsigned offset =PAGE_CACHE_SIZE ;int err; -if (!mapping) -BUG (); +BUG_ON (!mapping); inode = mapping->host; -if (!inode) -BUG (); +BUG_ON (!inode); end_index = inode->i_size >>PAGE_CACHE_SHIFT ;
fs/sysfs/inode.c +1 -2
@@ -175,8 +175,7 @@ const unsigned char * sysfs_get_name(strstruct bin_attribute * bin_attr;struct sysfs_symlink * sl; -if (!sd || !sd->s_element) -BUG (); +BUG_ON (!sd || !sd->s_element);switch (sd->s_type) {case SYSFS_DIR :
include/linux/fs.h +1 -1
@@ -864,7 +864,7 @@ struct super_block {*/ struct mutex s_vfs_rename_mutex;/* Kludge */ -/* Granuality of c/m/atime in ns. +/* Granularity of c/m/atime in ns. Cannot be worse than a second */ u32 s_time_gran; };
ipc/util.c +2 -4
@@ -266,8 +266,7 @@ struct kern_ipc_perm* ipc_rmid(struct ip {struct kern_ipc_perm * p;int lid = id %SEQ_MULTIPLIER ; -if (lid >= ids->entries->size) -BUG (); +BUG_ON (lid >= ids->entries->size);/* * do not need a rcu_dereference()() here to force ordering
@@ -275,8 +274,7 @@ struct kern_ipc_perm* ipc_rmid(struct ip*/ p = ids->entries->p[lid]; ids->entries->p[lid] =NULL ; -if (p==NULL ) -BUG (); +BUG_ON (p==NULL ); ids->in_use--;if (lid == ids->max_id) {
kernel/power/Kconfig +1 -1
@@ -41,7 +41,7 @@ config SOFTWARE_SUSPEND depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP) ---help--- Enable the possibility of suspending the machine. - It doesn't need APM. + It doesn't need ACPI or APM. You may suspend your machine by 'swsusp' or 'shutdown -z <time>' (patch for sysvinit needed).
kernel/printk.c +2 -4
@@ -360,8 +360,7 @@ static void call_console_drivers(unsigneunsigned long cur_index, start_print;static int msg_level =-1 ; -if (((long )(start - end)) >0 ) -BUG (); +BUG_ON (((long )(start - end)) >0 ); cur_index = start; start_print = start;
@@ -708,8 +707,7 @@ int __init add_preferred_console(char *n*/ void acquire_console_sem (void ) { -if (in_interrupt ()) -BUG (); +BUG_ON (in_interrupt ());down (&console_sem); console_locked =1 ; console_may_schedule =1 ;
kernel/time.c +4 -4
@@ -410,7 +410,7 @@ EXPORT_SYMBOL(current_kernel_time);* current_fs_time - Return FS time * @sb: Superblock. * -* Return the current time truncated to the time granuality supported by +* Return the current time truncated to the time granularity supported by * the fs. */ struct timespec current_fs_time (struct super_block *sb)
@@ -421,11 +421,11 @@ struct timespec current_fs_time(struct sEXPORT_SYMBOL (current_fs_time);/** -* timespec_trunc - Truncate timespec to a granuality +* timespec_trunc - Truncate timespec to a granularity * @t: Timespec -* @gran: Granuality in ns. +* @gran: Granularity in ns. * -* Truncate a timespec to a granuality. gran must be smaller than a second. +* Truncate a timespec to a granularity. gran must be smaller than a second. * Always rounds down. * * This function should be only used for timestamps returned by
mm/mmap.c +3 -6
@@ -294,8 +294,7 @@ void validate_mm(struct mm_struct *mm) i =browse_rb (&mm->mm_rb);if (i != mm->map_count)printk ("map_count %d rb %d\n" , mm->map_count, i), bug =1 ; -if (bug) - BUG(); + BUG_ON(bug); }#else #define validate_mm (mm) do { } while (0)
@@ -432,8 +431,7 @@ __insert_vm_struct(struct mm_struct * mmstruct rb_node ** rb_link, * rb_parent; __vma =find_vma_prepare (mm, vma->vm_start,&prev, &rb_link, &rb_parent); -if (__vma && __vma->vm_start < vma->vm_end) -BUG (); +BUG_ON (__vma && __vma->vm_start < vma->vm_end);__vma_link (mm, vma, prev, rb_link, rb_parent); mm->map_count++; }
@@ -813,8 +811,7 @@ try_prev:* (e.g. stash info in next's anon_vma_node when assigning * an anon_vma, or when trying vma_merge). Another time. */ -if (find_vma_prev (vma->vm_mm, vma->vm_start, &near) != vma) -BUG (); +BUG_ON (find_vma_prev (vma->vm_mm, vma->vm_start, &near) != vma);if (!near) goto none;
mm/swap_state.c +1 -2
@@ -148,8 +148,7 @@ int add_to_swap(struct page * page, gfp_swp_entry_t entry;int err; -if (!PageLocked (page)) -BUG (); +BUG_ON (!PageLocked (page));for (;;) { entry =get_swap_page ();
mm/vmalloc.c +1 -2
@@ -321,8 +321,7 @@ void __vunmap(void *addr, int deallocateint i;for (i =0 ; i < area->nr_pages; i++) { -if (unlikely (!area->pages[i])) -BUG (); +BUG_ON (!area->pages[i]);__free_page (area->pages[i]); }