diff options
| author | r.tyminski <r.tyminski@partner.samsung.com> | 2017-06-05 12:44:25 +0200 |
|---|---|---|
| committer | r.tyminski <r.tyminski@partner.samsung.com> | 2017-06-05 12:44:25 +0200 |
| commit | 146aec115cd05a164a88e6d7b07435c57a33817f (patch) | |
| tree | d8099075c92576b1928069af274f9b833aca996e /lib/libutils/isoc | |
| parent | f9a43781767007462965b21f3f518c4cfc0744c7 (diff) | |
| download | tef-optee_os-146aec115cd05a164a88e6d7b07435c57a33817f.tar.gz tef-optee_os-146aec115cd05a164a88e6d7b07435c57a33817f.tar.bz2 tef-optee_os-146aec115cd05a164a88e6d7b07435c57a33817f.zip | |
Update from upstream to 2.4.0 versionupstream/2.4.0upstream
Change-Id: I2b3a30f20684d6629fe379d9cd7895aff759c301
Diffstat (limited to 'lib/libutils/isoc')
| -rw-r--r-- | lib/libutils/isoc/bget_malloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libutils/isoc/bget_malloc.c b/lib/libutils/isoc/bget_malloc.c index 9cb2751..a4f7759 100644 --- a/lib/libutils/isoc/bget_malloc.c +++ b/lib/libutils/isoc/bget_malloc.c @@ -117,7 +117,8 @@ static uint32_t malloc_lock(void) { uint32_t exceptions; - exceptions = thread_mask_exceptions(THREAD_EXCP_IRQ | THREAD_EXCP_FIQ); + exceptions = thread_mask_exceptions( + THREAD_EXCP_NATIVE_INTR | THREAD_EXCP_FOREIGN_INTR); cpu_spin_lock(&__malloc_spinlock); return exceptions; } |