hc
2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84
kernel/arch/arm64/kvm/va_layout.c
....@@ -33,7 +33,7 @@
3333 static u64 tag_val;
3434 static u64 va_mask;
3535
36
-static void compute_layout(void)
36
+__init void kvm_compute_layout(void)
3737 {
3838 phys_addr_t idmap_addr = __pa_symbol(__hyp_idmap_text_start);
3939 u64 hyp_va_msb;
....@@ -121,8 +121,6 @@
121121
122122 BUG_ON(nr_inst != 5);
123123
124
- if (!has_vhe() && !va_mask)
125
- compute_layout();
126124
127125 for (i = 0; i < nr_inst; i++) {
128126 u32 rd, rn, insn, oinsn;
....@@ -166,9 +164,6 @@
166164 WARN_ON_ONCE(cpus_have_const_cap(ARM64_HARDEN_EL2_VECTORS));
167165 return;
168166 }
169
-
170
- if (!va_mask)
171
- compute_layout();
172167
173168 /*
174169 * Compute HYP VA by using the same computation as kern_hyp_va()