git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'davinci-fixes' of git://gitorious.org/linux-davinci/linux-davinci into...
[pandora-kernel.git]
/
mm
/
memory_hotplug.c
diff --git
a/mm/memory_hotplug.c
b/mm/memory_hotplug.c
index
321fc74
..
9ca1d60
100644
(file)
--- a/
mm/memory_hotplug.c
+++ b/
mm/memory_hotplug.c
@@
-375,7
+375,7
@@
void online_page(struct page *page)
#endif
#ifdef CONFIG_FLATMEM
#endif
#ifdef CONFIG_FLATMEM
- max_mapnr = max(p
age_to_pfn(page)
, max_mapnr);
+ max_mapnr = max(p
fn
, max_mapnr);
#endif
ClearPageReserved(page);
#endif
ClearPageReserved(page);
@@
-724,7
+724,7
@@
do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
pfn);
dump_page(page);
#endif
pfn);
dump_page(page);
#endif
- /* Beca
su
e we don't have big zone->lock. we should
+ /* Beca
us
e we don't have big zone->lock. we should
check this again here. */
if (page_count(page)) {
not_managed++;
check this again here. */
if (page_count(page)) {
not_managed++;