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 'staging-next' into Linux 3.1
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
init.c
diff --git
a/arch/arm/mm/init.c
b/arch/arm/mm/init.c
index
91bca35
..
f8037ba
100644
(file)
--- a/
arch/arm/mm/init.c
+++ b/
arch/arm/mm/init.c
@@
-298,7
+298,7
@@
static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
#ifdef CONFIG_HAVE_ARCH_PFN_VALID
int pfn_valid(unsigned long pfn)
{
#ifdef CONFIG_HAVE_ARCH_PFN_VALID
int pfn_valid(unsigned long pfn)
{
- return memblock_is_memory(
pfn << PAGE_SHIFT
);
+ return memblock_is_memory(
__pfn_to_phys(pfn)
);
}
EXPORT_SYMBOL(pfn_valid);
#endif
}
EXPORT_SYMBOL(pfn_valid);
#endif
@@
-496,6
+496,13
@@
static void __init free_unused_memmap(struct meminfo *mi)
*/
bank_start = min(bank_start,
ALIGN(prev_bank_end, PAGES_PER_SECTION));
*/
bank_start = min(bank_start,
ALIGN(prev_bank_end, PAGES_PER_SECTION));
+#else
+ /*
+ * Align down here since the VM subsystem insists that the
+ * memmap entries are valid from the bank start aligned to
+ * MAX_ORDER_NR_PAGES.
+ */
+ bank_start = round_down(bank_start, MAX_ORDER_NR_PAGES);
#endif
/*
* If we had a previous bank, and there is a space
#endif
/*
* If we had a previous bank, and there is a space