diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /mm | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'mm')
-rw-r--r-- | mm/hugetlb.c | 2 | ||||
-rw-r--r-- | mm/memory_hotplug.c | 6 | ||||
-rw-r--r-- | mm/page_alloc.c | 4 | ||||
-rw-r--r-- | mm/util.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1ef2cd4ae3c9..34f372ad89d0 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Generic hugetlb support. | 2 | * Generic hugetlb support. |
3 | * (C) William Irwin, April 2004 | 3 | * (C) Nadia Yvette Chambers, April 2004 |
4 | */ | 4 | */ |
5 | #include <linux/list.h> | 5 | #include <linux/list.h> |
6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index de9cb14ae753..c3e66ae411fd 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -1230,10 +1230,10 @@ repeat: | |||
1230 | goto repeat; | 1230 | goto repeat; |
1231 | } | 1231 | } |
1232 | } | 1232 | } |
1233 | /* drain all zone's lru pagevec, this is asyncronous... */ | 1233 | /* drain all zone's lru pagevec, this is asynchronous... */ |
1234 | lru_add_drain_all(); | 1234 | lru_add_drain_all(); |
1235 | yield(); | 1235 | yield(); |
1236 | /* drain pcp pages , this is synchrouns. */ | 1236 | /* drain pcp pages, this is synchronous. */ |
1237 | drain_all_pages(); | 1237 | drain_all_pages(); |
1238 | /* check again */ | 1238 | /* check again */ |
1239 | offlined_pages = check_pages_isolated(start_pfn, end_pfn); | 1239 | offlined_pages = check_pages_isolated(start_pfn, end_pfn); |
@@ -1242,7 +1242,7 @@ repeat: | |||
1242 | goto failed_removal; | 1242 | goto failed_removal; |
1243 | } | 1243 | } |
1244 | printk(KERN_INFO "Offlined Pages %ld\n", offlined_pages); | 1244 | printk(KERN_INFO "Offlined Pages %ld\n", offlined_pages); |
1245 | /* Ok, all of our target is islaoted. | 1245 | /* Ok, all of our target is isolated. |
1246 | We cannot do rollback at this point. */ | 1246 | We cannot do rollback at this point. */ |
1247 | offline_isolated_pages(start_pfn, end_pfn); | 1247 | offline_isolated_pages(start_pfn, end_pfn); |
1248 | /* reset pagetype flags and makes migrate type to be MOVABLE */ | 1248 | /* reset pagetype flags and makes migrate type to be MOVABLE */ |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5a8d339d282a..eee3efa58c91 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -523,7 +523,7 @@ static inline int page_is_buddy(struct page *page, struct page *buddy, | |||
523 | * If a block is freed, and its buddy is also free, then this | 523 | * If a block is freed, and its buddy is also free, then this |
524 | * triggers coalescing into a block of larger size. | 524 | * triggers coalescing into a block of larger size. |
525 | * | 525 | * |
526 | * -- wli | 526 | * -- nyc |
527 | */ | 527 | */ |
528 | 528 | ||
529 | static inline void __free_one_page(struct page *page, | 529 | static inline void __free_one_page(struct page *page, |
@@ -782,7 +782,7 @@ void __init init_cma_reserved_pageblock(struct page *page) | |||
782 | * large block of memory acted on by a series of small allocations. | 782 | * large block of memory acted on by a series of small allocations. |
783 | * This behavior is a critical factor in sglist merging's success. | 783 | * This behavior is a critical factor in sglist merging's success. |
784 | * | 784 | * |
785 | * -- wli | 785 | * -- nyc |
786 | */ | 786 | */ |
787 | static inline void expand(struct zone *zone, struct page *page, | 787 | static inline void expand(struct zone *zone, struct page *page, |
788 | int low, int high, struct free_area *area, | 788 | int low, int high, struct free_area *area, |
@@ -152,7 +152,7 @@ EXPORT_SYMBOL(__krealloc); | |||
152 | * | 152 | * |
153 | * The contents of the object pointed to are preserved up to the | 153 | * The contents of the object pointed to are preserved up to the |
154 | * lesser of the new and old sizes. If @p is %NULL, krealloc() | 154 | * lesser of the new and old sizes. If @p is %NULL, krealloc() |
155 | * behaves exactly like kmalloc(). If @size is 0 and @p is not a | 155 | * behaves exactly like kmalloc(). If @new_size is 0 and @p is not a |
156 | * %NULL pointer, the object pointed to is freed. | 156 | * %NULL pointer, the object pointed to is freed. |
157 | */ | 157 | */ |
158 | void *krealloc(const void *p, size_t new_size, gfp_t flags) | 158 | void *krealloc(const void *p, size_t new_size, gfp_t flags) |