diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-16 23:10:38 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-16 23:10:38 +0000 |
commit | 6f10c933298d622c6baf3cb3b2b1dc106950629a (patch) | |
tree | fbc9d7eb8fdce03eef8d44136fea8672c6b1b8a9 | |
parent | 0145211b0c6a1c4f4d4b869d1885668ecfde1a06 (diff) | |
parent | dddf3b4863ac285fdfa5d1c9e1269cee97c9644a (diff) | |
download | crosvm-android-security-14.0.0_r4.tar.gz |
Snap for 10147226 from dddf3b4863ac285fdfa5d1c9e1269cee97c9644a to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r8android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: Ie57117f64ac284aefcbfeee70ef320c05947d38f
-rw-r--r-- | hypervisor/src/gunyah/aarch64.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hypervisor/src/gunyah/aarch64.rs b/hypervisor/src/gunyah/aarch64.rs index e9e299580..104ba707e 100644 --- a/hypervisor/src/gunyah/aarch64.rs +++ b/hypervisor/src/gunyah/aarch64.rs @@ -41,9 +41,6 @@ fn fdt_create_shm_device( let shm_node = fdt.begin_node(&shm_name)?; fdt.property_string("vdevice-type", "shm")?; fdt.property_null("peer-default")?; - if options.purpose == MemoryRegionPurpose::StaticSwiotlbRegion { - fdt.property_string("push-compatible", "restricted-dma-pool")?; - } fdt.property_u64("dma_base", 0)?; let mem_node = fdt.begin_node("memory")?; fdt.property_u32("label", index)?; |