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 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
memblock.c
diff --git
a/arch/x86/mm/memblock.c
b/arch/x86/mm/memblock.c
index
aa11693
..
992da5e
100644
(file)
--- a/
arch/x86/mm/memblock.c
+++ b/
arch/x86/mm/memblock.c
@@
-8,7
+8,7
@@
#include <linux/range.h>
/* Check for already reserved areas */
#include <linux/range.h>
/* Check for already reserved areas */
-
static bool __init check_with_memblo
ck_reserved_size(u64 *addrp, u64 *sizep, u64 align)
+
bool __init memblock_x86_che
ck_reserved_size(u64 *addrp, u64 *sizep, u64 align)
{
struct memblock_region *r;
u64 addr = *addrp, last;
{
struct memblock_region *r;
u64 addr = *addrp, last;
@@
-59,7
+59,7
@@
u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align)
if (addr >= ei_last)
continue;
*sizep = ei_last - addr;
if (addr >= ei_last)
continue;
*sizep = ei_last - addr;
- while (
check_with_memblo
ck_reserved_size(&addr, sizep, align))
+ while (
memblock_x86_che
ck_reserved_size(&addr, sizep, align))
;
if (*sizep)
;
if (*sizep)