Adding function to calculate difference between two addresses.
Change-Id: If64d4b5f342f063dd0394c7bcc8a2389a63fe702
diff --git a/src/api.c b/src/api.c
index c9246c6..60954c3 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1177,7 +1177,7 @@
* invalidation.
*/
void *ptr = mm_identity_map(begin, end, MM_MODE_W, ppool);
- size_t size = pa_addr(end) - pa_addr(begin);
+ size_t size = pa_difference(begin, end);
if (!ptr) {
/* TODO: partial defrag of failed range. */
diff --git a/src/fdt_handler.c b/src/fdt_handler.c
index d51250b..fa789b2 100644
--- a/src/fdt_handler.c
+++ b/src/fdt_handler.c
@@ -343,13 +343,13 @@
*/
fdt_add_mem_reservation(
fdt, pa_addr(layout_text_begin()),
- pa_addr(layout_text_end()) - pa_addr(layout_text_begin()));
+ pa_difference(layout_text_begin(), layout_text_end()));
fdt_add_mem_reservation(
fdt, pa_addr(layout_rodata_begin()),
- pa_addr(layout_rodata_end()) - pa_addr(layout_rodata_begin()));
+ pa_difference(layout_rodata_begin(), layout_rodata_end()));
fdt_add_mem_reservation(
fdt, pa_addr(layout_data_begin()),
- pa_addr(layout_data_end()) - pa_addr(layout_data_begin()));
+ pa_difference(layout_data_begin(), layout_data_end()));
/* Patch FDT to reserve memory for secondary VMs. */
for (i = 0; i < p->reserved_ranges_count; ++i) {
diff --git a/src/load.c b/src/load.c
index 66b7034..ef033a6 100644
--- a/src/load.c
+++ b/src/load.c
@@ -180,7 +180,7 @@
*/
for (i = 0; i < mem_ranges_count; ++i) {
if (size_to_find <=
- pa_addr(mem_ranges[i].end) - pa_addr(mem_ranges[i].begin)) {
+ pa_difference(mem_ranges[i].begin, mem_ranges[i].end)) {
/*
* This range is big enough, take some of it from the
* end and reduce its size accordingly.
diff --git a/src/main.c b/src/main.c
index 1df1802..6263c32 100644
--- a/src/main.c
+++ b/src/main.c
@@ -88,7 +88,7 @@
}
memiter_init(&cpio, initrd,
- pa_addr(params.initrd_end) - pa_addr(params.initrd_begin));
+ pa_difference(params.initrd_begin, params.initrd_end));
/* Load all VMs. */
if (!load_primary(&cpio, params.kernel_arg, &primary_initrd, &ppool)) {