Skip to content

Commit

Permalink
Fix typos in doc and comments
Browse files Browse the repository at this point in the history
Changes persistant -> persistent. www.dictionary.com does not know
persistant (with an A), but should it be one of those things you can
spell in more than one correct way, let me know.

Signed-off-by: Jan Engelhardt <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>
  • Loading branch information
Jan Engelhardt authored and AdrianBunk committed Nov 30, 2006
1 parent 93e06b4 commit 03a67a4
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Documentation/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ udev
----
udev is a userspace application for populating /dev dynamically with
only entries for devices actually present. udev replaces the basic
functionality of devfs, while allowing persistant device naming for
functionality of devfs, while allowing persistent device naming for
devices.

FUSE
Expand Down
2 changes: 1 addition & 1 deletion Documentation/power/states.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ setup via another operating system for it to use. Despite the
inconvenience, this method requires minimal work by the kernel, since
the firmware will also handle restoring memory contents on resume.

If the kernel is responsible for persistantly saving state, a mechanism
If the kernel is responsible for persistently saving state, a mechanism
called 'swsusp' (Swap Suspend) is used to write memory contents to
free swap space. swsusp has some restrictive requirements, but should
work in most cases. Some, albeit outdated, documentation can be found
Expand Down
2 changes: 1 addition & 1 deletion arch/um/drivers/chan_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static int winch_thread(void *arg)
/* These are synchronization calls between various UML threads on the
* host - since they are not different kernel threads, we cannot use
* kernel semaphores. We don't use SysV semaphores because they are
* persistant. */
* persistent. */
count = os_read_file(pipe_fd, &c, sizeof(c));
if(count != sizeof(c))
printk("winch_thread : failed to read synchronization byte, "
Expand Down
2 changes: 1 addition & 1 deletion drivers/message/fusion/mptbase.c
Original file line number Diff line number Diff line change
Expand Up @@ -6185,7 +6185,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
"Abort", /* 12h */
"IO Not Yet Executed", /* 13h */
"IO Executed", /* 14h */
"Persistant Reservation Out Not Affiliation Owner", /* 15h */
"Persistent Reservation Out Not Affiliation Owner", /* 15h */
"Open Transmit DMA Abort", /* 16h */
"IO Device Missing Delay Retry", /* 17h */
NULL, /* 18h */
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/cfi_flagadm.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct mtd_partition flagadm_parts[] = {
.size = FLASH_PARTITION2_SIZE
},
{
.name = "Persistant storage",
.name = "Persistent storage",
.offset = FLASH_PARTITION3_ADDR,
.size = FLASH_PARTITION3_SIZE
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ config PCI_MULTITHREAD_PROBE

It is very unwise to use this option if you are not using a
boot process that can handle devices being created in any
order. A program that can create persistant block and network
order. A program that can create persistent block and network
device names (like udev) is a good idea if you wish to use
this option.

Expand Down
2 changes: 1 addition & 1 deletion fs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ config SYSFS

Some system agents rely on the information in sysfs to operate.
/sbin/hotplug uses device and object attributes in sysfs to assist in
delegating policy decisions, like persistantly naming devices.
delegating policy decisions, like persistently naming devices.

sysfs is currently used by the block subsystem to mount the root
partition. If sysfs is disabled you must specify the boot device on
Expand Down
2 changes: 1 addition & 1 deletion fs/jfs/jfs_filsys.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
#define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */

/* Directory index */
#define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
#define JFS_DIR_INDEX 0x00200000 /* Persistent index for */
/* directory entries */


Expand Down
4 changes: 2 additions & 2 deletions include/linux/textsearch.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct ts_config;
/**
* struct ts_state - search state
* @offset: offset for next match
* @cb: control buffer, for persistant variables of get_next_block()
* @cb: control buffer, for persistent variables of get_next_block()
*/
struct ts_state
{
Expand Down Expand Up @@ -71,7 +71,7 @@ struct ts_config
* Called repeatedly until 0 is returned. Must assign the
* head of the next block of data to &*dst and return the length
* of the block or 0 if at the end. consumed == 0 indicates
* a new search. May store/read persistant values in state->cb.
* a new search. May store/read persistent values in state->cb.
*/
unsigned int (*get_next_block)(unsigned int consumed,
const u8 **dst,
Expand Down
2 changes: 1 addition & 1 deletion lib/textsearch.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* configuration according to the specified parameters.
* (3) User starts the search(es) by calling _find() or _next() to
* fetch subsequent occurrences. A state variable is provided
* to the algorihtm to store persistant variables.
* to the algorihtm to store persistent variables.
* (4) Core eventually resets the search offset and forwards the find()
* request to the algorithm.
* (5) Algorithm calls get_next_block() provided by the user continously
Expand Down

0 comments on commit 03a67a4

Please sign in to comment.