| commit | 07b1926f9f5196bd50e38d79424f80b6e4247fcb | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@google.com> | Thu Nov 07 13:30:14 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 07 13:30:15 2013 +0000 |
| tree | b20925ec37614fa4616afaaaa0acd0e86b91c834 | |
| parent | b9154e33f8891b7e7df1b9cda596d6fad1387f2d [diff] | |
| parent | 958fd7a88b6c3a7200332bc381d3b169e54c9aee [diff] |
Merge "keymaster: rename ion_allocation_data.heap_mask to heap_id_mask"
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp index 2284290..9d0b319 100644 --- a/keymaster_qcom.cpp +++ b/keymaster_qcom.cpp
@@ -224,7 +224,7 @@ ion_alloc_data.align = 4096; /* memory is allocated from EBI heap */ - ion_alloc_data.heap_mask= ION_HEAP(ION_QSECOM_HEAP_ID); + ion_alloc_data.heap_id_mask= ION_HEAP(ION_QSECOM_HEAP_ID); /* Set the memory to be uncached */ ion_alloc_data.flags = 0;