diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-27 17:29:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 21:43:46 -0500 |
commit | 89d790ab31d033d67635f6362d57ea64e47708fa (patch) | |
tree | 759bde58191264c9a24fb7f15c6ceb843a922b17 | |
parent | 550116d21a656e8b5670073e586315e5a6d12f01 (diff) |
scripts/spelling.txt: add "algined" pattern and fix typo instances
Fix typos and add the following to the scripts/spelling.txt:
algined||aligned
While we are here, fix the "appplication" in the touched line in
drivers/block/loop.c. Also, fix the "may not naturally ..." to
"may not be naturally ..." in the touched line in mm/page_alloc.
Link: http://lkml.kernel.org/r/1481573103-11329-9-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/block/loop.c | 2 | ||||
-rw-r--r-- | mm/page_alloc.c | 2 | ||||
-rw-r--r-- | scripts/spelling.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 304377182c1a..4b52a1690329 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -186,7 +186,7 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) | |||
186 | * | 186 | * |
187 | * TODO: the above condition may be loosed in the future, and | 187 | * TODO: the above condition may be loosed in the future, and |
188 | * direct I/O may be switched runtime at that time because most | 188 | * direct I/O may be switched runtime at that time because most |
189 | * of requests in sane appplications should be PAGE_SIZE algined | 189 | * of requests in sane applications should be PAGE_SIZE aligned |
190 | */ | 190 | */ |
191 | if (dio) { | 191 | if (dio) { |
192 | if (queue_logical_block_size(lo->lo_queue) >= sb_bsize && | 192 | if (queue_logical_block_size(lo->lo_queue) >= sb_bsize && |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9f9623d690d6..a7a6aac95a6d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -5925,7 +5925,7 @@ static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages, | |||
5925 | * the zone and SPARSEMEM is in use. If there are holes within the | 5925 | * the zone and SPARSEMEM is in use. If there are holes within the |
5926 | * zone, each populated memory region may cost us one or two extra | 5926 | * zone, each populated memory region may cost us one or two extra |
5927 | * memmap pages due to alignment because memmap pages for each | 5927 | * memmap pages due to alignment because memmap pages for each |
5928 | * populated regions may not naturally algined on page boundary. | 5928 | * populated regions may not be naturally aligned on page boundary. |
5929 | * So the (present_pages >> 4) heuristic is a tradeoff for that. | 5929 | * So the (present_pages >> 4) heuristic is a tradeoff for that. |
5930 | */ | 5930 | */ |
5931 | if (spanned_pages > present_pages + (present_pages >> 4) && | 5931 | if (spanned_pages > present_pages + (present_pages >> 4) && |
diff --git a/scripts/spelling.txt b/scripts/spelling.txt index 12777ab32306..096e8b8b6502 100644 --- a/scripts/spelling.txt +++ b/scripts/spelling.txt | |||
@@ -65,6 +65,7 @@ afecting||affecting | |||
65 | agaist||against | 65 | agaist||against |
66 | albumns||albums | 66 | albumns||albums |
67 | alegorical||allegorical | 67 | alegorical||allegorical |
68 | algined||aligned | ||
68 | algorith||algorithm | 69 | algorith||algorithm |
69 | algorithmical||algorithmically | 70 | algorithmical||algorithmically |
70 | algoritm||algorithm | 71 | algoritm||algorithm |