diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-20 16:58:06 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-12-20 16:58:06 -0800 |
| commit | 5eccb9646dd94438911706d3ebf52775caa7f41e (patch) | |
| tree | 65e098b6c9b6e25947f40a8466d05f87c906af5d /libc/bionic/system_properties.c | |
| parent | 026b6ab6d5f0d8fca5cdfab05727197626769dc2 (diff) | |
| download | bionic-5eccb9646dd94438911706d3ebf52775caa7f41e.zip bionic-5eccb9646dd94438911706d3ebf52775caa7f41e.tar.gz bionic-5eccb9646dd94438911706d3ebf52775caa7f41e.tar.bz2 | |
Fix aarch64 futex assembly routines.
Also make the other architectures more similar to one another,
use NULL instead of 0 in calling code, and remove an unused #define.
Change-Id: I52b874afb6a351c802f201a0625e484df6d093bb
Diffstat (limited to 'libc/bionic/system_properties.c')
| -rw-r--r-- | libc/bionic/system_properties.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c index 9fdb6f5..825894f 100644 --- a/libc/bionic/system_properties.c +++ b/libc/bionic/system_properties.c @@ -454,7 +454,7 @@ int __system_property_read(const prop_info *pi, char *name, char *value) for(;;) { serial = pi->serial; while(SERIAL_DIRTY(serial)) { - __futex_wait((volatile void *)&pi->serial, serial, 0); + __futex_wait((volatile void *)&pi->serial, serial, NULL); serial = pi->serial; } len = SERIAL_VALUE_LEN(serial); @@ -572,12 +572,12 @@ int __system_property_wait(const prop_info *pi) prop_area *pa = __system_property_area__; n = pa->serial; do { - __futex_wait(&pa->serial, n, 0); + __futex_wait(&pa->serial, n, NULL); } while(n == pa->serial); } else { n = pi->serial; do { - __futex_wait((volatile void *)&pi->serial, n, 0); + __futex_wait((volatile void *)&pi->serial, n, NULL); } while(n == pi->serial); } return 0; @@ -635,7 +635,7 @@ unsigned int __system_property_wait_any(unsigned int serial) prop_area *pa = __system_property_area__; do { - __futex_wait(&pa->serial, serial, 0); + __futex_wait(&pa->serial, serial, NULL); } while(pa->serial == serial); return pa->serial; |