projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
mm
/
memblock.c
diff --git
a/mm/memblock.c
b/mm/memblock.c
index
c8dfa43
..
7608bc3
100644
(file)
--- a/
mm/memblock.c
+++ b/
mm/memblock.c
@@
-723,7
+723,7
@@
int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
(unsigned long long)base + size - 1,
(void *)_RET_IP_);
(unsigned long long)base + size - 1,
(void *)_RET_IP_);
- kmemleak_free_part
(__va(base)
, size);
+ kmemleak_free_part
_phys(base
, size);
return memblock_remove_range(&memblock.reserved, base, size);
}
return memblock_remove_range(&memblock.reserved, base, size);
}
@@
-1152,7
+1152,7
@@
static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
* The min_count is set to 0 so that memblock allocations are
* never reported as leaks.
*/
* The min_count is set to 0 so that memblock allocations are
* never reported as leaks.
*/
- kmemleak_alloc
(__va(found)
, size, 0, 0);
+ kmemleak_alloc
_phys(found
, size, 0, 0);
return found;
}
return 0;
return found;
}
return 0;
@@
-1399,7
+1399,7
@@
void __init __memblock_free_early(phys_addr_t base, phys_addr_t size)
memblock_dbg("%s: [%#016llx-%#016llx] %pF\n",
__func__, (u64)base, (u64)base + size - 1,
(void *)_RET_IP_);
memblock_dbg("%s: [%#016llx-%#016llx] %pF\n",
__func__, (u64)base, (u64)base + size - 1,
(void *)_RET_IP_);
- kmemleak_free_part
(__va(base)
, size);
+ kmemleak_free_part
_phys(base
, size);
memblock_remove_range(&memblock.reserved, base, size);
}
memblock_remove_range(&memblock.reserved, base, size);
}
@@
-1419,7
+1419,7
@@
void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
memblock_dbg("%s: [%#016llx-%#016llx] %pF\n",
__func__, (u64)base, (u64)base + size - 1,
(void *)_RET_IP_);
memblock_dbg("%s: [%#016llx-%#016llx] %pF\n",
__func__, (u64)base, (u64)base + size - 1,
(void *)_RET_IP_);
- kmemleak_free_part
(__va(base)
, size);
+ kmemleak_free_part
_phys(base
, size);
cursor = PFN_UP(base);
end = PFN_DOWN(base + size);
cursor = PFN_UP(base);
end = PFN_DOWN(base + size);