projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/sata-rcar-to-v3.18-rc5' into backport/v3.14...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
memblock.c
diff --git
a/mm/memblock.c
b/mm/memblock.c
index
39a31e7
..
0739dc1
100644
(file)
--- a/
mm/memblock.c
+++ b/
mm/memblock.c
@@
-183,8
+183,7
@@
phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size,
phys_addr_t align, phys_addr_t start,
phys_addr_t end, int nid)
{
phys_addr_t align, phys_addr_t start,
phys_addr_t end, int nid)
{
- int ret;
- phys_addr_t kernel_end;
+ phys_addr_t kernel_end, ret;
/* pump up @end */
if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
/* pump up @end */
if (end == MEMBLOCK_ALLOC_ACCESSIBLE)