diff --git a/drivers/staging/android/debug_kinfo.c b/drivers/staging/android/debug_kinfo.c
index 6d7bb750555c..bef66e859331 100644
--- a/drivers/staging/android/debug_kinfo.c
+++ b/drivers/staging/android/debug_kinfo.c
@@ -140,20 +140,20 @@ static int debug_kinfo_probe(struct platform_device *pdev)
 	info->bit_per_long = BITS_PER_LONG;
 	info->module_name_len = MODULE_NAME_LEN;
 	info->symbol_len = KSYM_SYMBOL_LEN;
-	info->_addresses_pa = (u64)virt_to_phys((volatile void *)kallsyms_addresses);
-	info->_relative_pa = (u64)virt_to_phys((volatile void *)kallsyms_relative_base);
-	info->_stext_pa = (u64)virt_to_phys(_stext);
-	info->_etext_pa = (u64)virt_to_phys(_etext);
-	info->_sinittext_pa = (u64)virt_to_phys(_sinittext);
-	info->_einittext_pa = (u64)virt_to_phys(_einittext);
-	info->_end_pa = (u64)virt_to_phys(_end);
-	info->_offsets_pa = (u64)virt_to_phys((volatile void *)kallsyms_offsets);
-	info->_names_pa = (u64)virt_to_phys((volatile void *)kallsyms_names);
-	info->_token_table_pa = (u64)virt_to_phys((volatile void *)kallsyms_token_table);
-	info->_token_index_pa = (u64)virt_to_phys((volatile void *)kallsyms_token_index);
-	info->_markers_pa = (u64)virt_to_phys((volatile void *)kallsyms_markers);
+	info->_addresses_pa = (u64)__pa_symbol((volatile void *)kallsyms_addresses);
+	info->_relative_pa = (u64)__pa_symbol((volatile void *)kallsyms_relative_base);
+	info->_stext_pa = (u64)__pa_symbol(_stext);
+	info->_etext_pa = (u64)__pa_symbol(_etext);
+	info->_sinittext_pa = (u64)__pa_symbol(_sinittext);
+	info->_einittext_pa = (u64)__pa_symbol(_einittext);
+	info->_end_pa = (u64)__pa_symbol(_end);
+	info->_offsets_pa = (u64)__pa_symbol((volatile void *)kallsyms_offsets);
+	info->_names_pa = (u64)__pa_symbol((volatile void *)kallsyms_names);
+	info->_token_table_pa = (u64)__pa_symbol((volatile void *)kallsyms_token_table);
+	info->_token_index_pa = (u64)__pa_symbol((volatile void *)kallsyms_token_index);
+	info->_markers_pa = (u64)__pa_symbol((volatile void *)kallsyms_markers);
 	info->thread_size = THREAD_SIZE;
-	info->swapper_pg_dir_pa = (u64)virt_to_phys(swapper_pg_dir);
+	info->swapper_pg_dir_pa = (u64)__pa_symbol(swapper_pg_dir);
 	strlcpy(info->last_uts_release, init_utsname()->release, sizeof(info->last_uts_release));
 	info->enabled_modules_tree_lookup = IS_ENABLED(CONFIG_MODULES_TREE_LOOKUP);
 	info->mod_core_layout_offset = offsetof(struct module, core_layout);