mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) trivial: chack -> check typo fix in main Makefile trivial: Add a space (and a comma) to a printk in 8250 driver trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx trivial: Fix misspelling of "firmware" in powerpc Makefile trivial: Fix misspelling of "firmware" in usb.c trivial: Fix misspelling of "firmware" in qla1280.c trivial: Fix misspelling of "firmware" in a100u2w.c trivial: Fix misspelling of "firmware" in megaraid.c trivial: Fix misspelling of "firmware" in ql4_mbx.c trivial: Fix misspelling of "firmware" in acpi_memhotplug.c trivial: Fix misspelling of "firmware" in ipw2100.c trivial: Fix misspelling of "firmware" in atmel.c trivial: Fix misspelled firmware in Kconfig trivial: fix an -> a typos in documentation and comments trivial: fix then -> than typos in comments and documentation trivial: update Jesper Juhl CREDITS entry with new email trivial: fix singal -> signal typo trivial: Fix incorrect use of "loose" in event.c trivial: printk: fix indentation of new_text_line declaration trivial: rtc-stk17ta8: fix sparse warning ...
This commit is contained in:
commit
57c44c5f6f
99 changed files with 133 additions and 130 deletions
|
|
@ -34,7 +34,7 @@
|
|||
* aperture size, not the dram size, and the V370PDC supplies no
|
||||
* other method for memory size discovery. This problem is
|
||||
* mostly only relevant when compiled as a module, as the
|
||||
* unloading of the module with an aperture size smaller then
|
||||
* unloading of the module with an aperture size smaller than
|
||||
* the ram will cause the driver to detect the onboard memory
|
||||
* size to be equal to the aperture size when the module is
|
||||
* reloaded. Soooo, to help, the module supports an msize
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@ write_error:
|
|||
* to the real data size, although the @buf buffer has to contain the
|
||||
* alignment. In all other cases, @len has to be aligned.
|
||||
*
|
||||
* It is prohibited to write more then once to logical eraseblocks of static
|
||||
* It is prohibited to write more than once to logical eraseblocks of static
|
||||
* volumes. This function returns zero in case of success and a negative error
|
||||
* code in case of failure.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -465,7 +465,7 @@ out:
|
|||
* This function synchronously erases physical eraseblock @pnum. If @torture
|
||||
* flag is not zero, the physical eraseblock is checked by means of writing
|
||||
* different patterns to it and reading them back. If the torturing is enabled,
|
||||
* the physical eraseblock is erased more then once.
|
||||
* the physical eraseblock is erased more than once.
|
||||
*
|
||||
* This function returns the number of erasures made in case of success, %-EIO
|
||||
* if the erasure failed or the torturing test failed, and other negative error
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si,
|
|||
return 0;
|
||||
} else {
|
||||
/*
|
||||
* This logical eraseblock is older then the one found
|
||||
* This logical eraseblock is older than the one found
|
||||
* previously.
|
||||
*/
|
||||
if (cmp_res & 4)
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ enum {
|
|||
* The erase counter header takes 64 bytes and has a plenty of unused space for
|
||||
* future usage. The unused fields are zeroed. The @version field is used to
|
||||
* indicate the version of UBI implementation which is supposed to be able to
|
||||
* work with this UBI image. If @version is greater then the current UBI
|
||||
* work with this UBI image. If @version is greater than the current UBI
|
||||
* version, the image is rejected. This may be useful in future if something
|
||||
* is changed radically. This field is duplicated in the volume identifier
|
||||
* header.
|
||||
|
|
@ -187,7 +187,7 @@ struct ubi_ec_hdr {
|
|||
* (sequence number) is used to distinguish between older and newer versions of
|
||||
* logical eraseblocks.
|
||||
*
|
||||
* There are 2 situations when there may be more then one physical eraseblock
|
||||
* There are 2 situations when there may be more than one physical eraseblock
|
||||
* corresponding to the same logical eraseblock, i.e., having the same @vol_id
|
||||
* and @lnum values in the volume identifier header. Suppose we have a logical
|
||||
* eraseblock L and it is mapped to the physical eraseblock P.
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
|
|||
if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) {
|
||||
/* Auto re-size flag may be set only for one volume */
|
||||
if (ubi->autoresize_vol_id != -1) {
|
||||
ubi_err("more then one auto-resize volume (%d "
|
||||
ubi_err("more than one auto-resize volume (%d "
|
||||
"and %d)", ubi->autoresize_vol_id, i);
|
||||
kfree(vol);
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@
|
|||
* situation when the picked physical eraseblock is constantly erased after the
|
||||
* data is written to it. So, we have a constant which limits the highest erase
|
||||
* counter of the free physical eraseblock to pick. Namely, the WL sub-system
|
||||
* does not pick eraseblocks with erase counter greater then the lowest erase
|
||||
* does not pick eraseblocks with erase counter greater than the lowest erase
|
||||
* counter plus %WL_FREE_MAX_DIFF.
|
||||
*/
|
||||
#define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD)
|
||||
|
|
@ -917,7 +917,7 @@ static int ensure_wear_leveling(struct ubi_device *ubi)
|
|||
/*
|
||||
* We schedule wear-leveling only if the difference between the
|
||||
* lowest erase counter of used physical eraseblocks and a high
|
||||
* erase counter of free physical eraseblocks is greater then
|
||||
* erase counter of free physical eraseblocks is greater than
|
||||
* %UBI_WL_THRESHOLD.
|
||||
*/
|
||||
e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb);
|
||||
|
|
|
|||
Loading…
Reference in a new issue