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/memory_hotplug.c | |
| 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/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 */ |