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 'master' of git://git.infradead.org/users/linville/wireless-next into...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
init.c
diff --git
a/arch/arm/mm/init.c
b/arch/arm/mm/init.c
index
91bca35
..
cc7e2d8
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)
{
- return memblock_is_memory(
pfn << PAGE_SHIFT
);
+ return memblock_is_memory(
__pfn_to_phys(pfn)
);
}
EXPORT_SYMBOL(pfn_valid);
#endif