Erik Gilling
614628b018
update linux/tegrafb.h
...
Change-Id: I5edab909e5fe491a95729aa89b2f37c02af6bcba
2010-09-08 15:29:08 -07:00
Dmitry Shmidt
cee39c250c
Merge "Update if.h, if_vlan,h and add in_route.h"
2010-09-08 11:36:50 -07:00
Dmitry Shmidt
2a8245c914
Update if.h, if_vlan,h and add in_route.h
...
Change-Id: I557a5ab71ea8dee18f5666b660fc73889c759851
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-08 11:32:16 -07:00
Keith Deacon
8f670c8e41
am d7b156d2
: am 3a1bbee3
: Add eventfd system call support
...
Merge commit 'd7b156d2a38e58ab1e5f9e6a4b420588aeb78b46'
* commit 'd7b156d2a38e58ab1e5f9e6a4b420588aeb78b46':
Add eventfd system call support
2010-09-08 03:10:44 -07:00
Keith Deacon
d7b156d2a3
am 3a1bbee3
: Add eventfd system call support
...
Merge commit '3a1bbee36b773862e88c6f1895b607c0cd81b499' into gingerbread-plus-aosp
* commit '3a1bbee36b773862e88c6f1895b607c0cd81b499':
Add eventfd system call support
2010-09-08 03:06:26 -07:00
Andy McFadden
f0c5eeeeef
Merge "Add a memory barrier to cond var signaling."
2010-09-07 14:05:33 -07:00
Rebecca Schultz Zavin
b8faf0662b
Merge "Fix libthread_db linkage"
2010-09-03 15:24:33 -07:00
Iliyan Malchev
575d6b3f10
bionic: update processed cpcap_audio.h
...
Change-Id: I6ef25c4c95aaebdf4efc2561a726a0ce1c90032e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-09-03 10:09:37 -07:00
Antti Hatala
94962b9c9c
Fix libthread_db linkage
...
libthread_db depends on libc but since unresolved symbols were allowed
in the makefile this problem was never realized until gdbserver tried
to link with it, failing in the runtime.
Change-Id: If2ee319a2503c81abf3010829444f920c7c0c227
2010-09-02 14:00:59 -07:00
Andy McFadden
e2ac89869f
Add a memory barrier to cond var signaling.
...
This adds an explicit memory barrier to condition variable signaling.
It's a little murky as to whether it's strictly required, but it seems
like a wise thing to do.
Change-Id: Id0faa542d61e4b8ffa775e4adf68e4d7471f4fb7
2010-09-02 13:34:53 -07:00
rich cannings
964a14d0dd
am 9579ee38
: am 6e42398d
: Merge "Fix return value." into gingerbread
...
Merge commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0'
* commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0':
Fix return value.
2010-08-31 15:55:44 -07:00
rich cannings
9579ee380c
am 6e42398d
: Merge "Fix return value." into gingerbread
...
Merge commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283' into gingerbread-plus-aosp
* commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283':
Fix return value.
2010-08-31 15:52:47 -07:00
rich cannings
6e42398dd6
Merge "Fix return value." into gingerbread
2010-08-31 15:48:25 -07:00
rich cannings
e44cb1a35c
Fix return value.
...
Return a valid pointer (not NULL) when the character "c" is at the end of "src".
Change-Id: Iab0b677943f2c8a9fbb255c44689f5d6dc3535d7
Example:
memccpy(dest, "xzy", 'y', 3) should return dest+3 rather than null.
2010-08-31 15:19:38 -07:00
Keith Deacon
3a1bbee36b
Add eventfd system call support
2010-08-31 16:16:01 -05:00
Jesse Wilson
a93baa9fc6
am 3fda8700
: am cc6b1829
: Merge "Make timezones available to the host build." into gingerbread
...
Merge commit '3fda8700bd042fbb7ac37e2bbe7496df8a087244'
* commit '3fda8700bd042fbb7ac37e2bbe7496df8a087244':
Make timezones available to the host build.
2010-08-31 14:06:19 -07:00
Jesse Wilson
3fda8700bd
am cc6b1829
: Merge "Make timezones available to the host build." into gingerbread
...
Merge commit 'cc6b18291075a7960ad0d638d2047f41be1297e8' into gingerbread-plus-aosp
* commit 'cc6b18291075a7960ad0d638d2047f41be1297e8':
Make timezones available to the host build.
2010-08-31 14:04:15 -07:00
Jesse Wilson
cc6b182910
Merge "Make timezones available to the host build." into gingerbread
2010-08-31 14:01:13 -07:00
Jesse Wilson
e77d54d98a
Make timezones available to the host build.
...
Change-Id: Ib2c89ac13b03f07c6c712a544bc0d5d1c9dc57df
2010-08-31 13:16:25 -07:00
Jean-Baptiste Queru
2577f413fa
am 97b06ef7
: Merge (ignore) from open-source master tree
...
Merge commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7'
* commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7':
2010-08-31 13:13:06 -07:00
Jean-Baptiste Queru
97b06ef7dd
Merge (ignore) from open-source master tree
...
Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2
2010-08-31 13:08:11 -07:00
Jean-Baptiste Queru
c111863fbf
resolved conflicts for merge of a1727092
to gingerbread-plus-aosp
...
Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8
2010-08-30 14:13:18 -07:00
David 'Digit' Turner
db0017e5e2
am 994b68f5
: resolved conflicts for merge of 6a51defa
to gingerbread-plus-aosp
...
Merge commit '994b68f5c7d637d2945c06260fe35b266c10379d'
* commit '994b68f5c7d637d2945c06260fe35b266c10379d':
Fix __get_tls() in static C library to use kernel helpers.
2010-08-29 17:48:55 -07:00
David 'Digit' Turner
994b68f5c7
resolved conflicts for merge of 6a51defa
to gingerbread-plus-aosp
...
Change-Id: I0367bcffe9179904ca820e3b824dddfa47594f63
2010-08-29 17:41:36 -07:00
David 'Digit' Turner
6a51defa03
Fix __get_tls() in static C library to use kernel helpers.
...
This is needed to fix gdbserver's handling of threaded programs,
among other things.
Change-Id: I823387c602cef9891532da946a01db14be780ab0
2010-08-27 08:19:19 -07:00
Nick Pelly
67b2206bbd
Merge "Add clean kernel header perf_event.h"
2010-08-26 11:31:53 -07:00
Szymon Jakubczak
75a3689b69
am 41e533af
: added missing ether_aton and ether_ntoa
...
Merge commit '41e533af4a2720c1dc228ba40b6582ca53085c3a'
* commit '41e533af4a2720c1dc228ba40b6582ca53085c3a':
added missing ether_aton and ether_ntoa
2010-08-25 09:56:25 -07:00
Szymon Jakubczak
41e533af4a
added missing ether_aton and ether_ntoa
...
Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc
2010-08-25 08:46:23 -07:00
Nick Pelly
976c44be65
Add clean kernel header perf_event.h
...
Change-Id: I0d0e9da7579b1cccb9492ad8d594fe24dc1296e3
Signed-off-by: Nick Pelly <npelly@google.com>
2010-08-24 11:10:05 -07:00
Iliyan Malchev
a169e31a06
bionic: add processed audio-driver (i2s & cpcap) headers
...
Change-Id: Ib7db8aded1d41f54bbd681df116571c1996c569c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-08-23 21:01:55 -07:00
Rebecca Schultz Zavin
eae561b2ab
Merge "Headers for tegra_camera device"
2010-08-19 16:55:54 -07:00
Rebecca Schultz Zavin
053febdd3b
Headers for tegra_camera device
...
Change-Id: Iaea67ee157b6ecd7a4485c8f716515da5c56601f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2010-08-18 16:57:19 -07:00
Brian Carlstrom
76fedd24f3
am 0a4a393d
: am 22f1e3d4
: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
...
Merge commit '0a4a393d717a2289c9fa2036f502f97c74d56e35'
* commit '0a4a393d717a2289c9fa2036f502f97c74d56e35':
Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
2010-08-18 13:41:09 -07:00
Dima Zavin
e46b482282
am 6b8c6a26
: am a7161902
: linker: fix overwriting the real linker error string
...
Merge commit '6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2'
* commit '6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2':
linker: fix overwriting the real linker error string
2010-08-18 13:41:07 -07:00
Brian Carlstrom
0a4a393d71
am 22f1e3d4
: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
...
Merge commit '22f1e3d4fae7d45cc439da94690d786ed44756fb' into gingerbread-plus-aosp
* commit '22f1e3d4fae7d45cc439da94690d786ed44756fb':
Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
2010-08-18 13:39:12 -07:00
Dima Zavin
6b8c6a26f1
am a7161902
: linker: fix overwriting the real linker error string
...
Merge commit 'a716190241da07f42cf874b04bf044261f36381c' into gingerbread-plus-aosp
* commit 'a716190241da07f42cf874b04bf044261f36381c':
linker: fix overwriting the real linker error string
2010-08-18 13:35:40 -07:00
Jean-Baptiste Queru
076bc8f92d
am 3871d57b
: Revert "added missing ether_aton and ether_ntoa"
...
Merge commit '3871d57ba581236142c9bf2f8be2d34cce7c5829'
* commit '3871d57ba581236142c9bf2f8be2d34cce7c5829':
Revert "added missing ether_aton and ether_ntoa"
2010-08-18 13:31:49 -07:00
Jean-Baptiste Queru
3871d57ba5
Revert "added missing ether_aton and ether_ntoa"
...
This reverts commit 4032c1e2df
.
2010-08-18 11:15:39 -07:00
Brian Carlstrom
22f1e3d4fa
Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
...
(We've been missing the zoneinfo.* files for the host dalvikvm. My fix for
gingerbread will have to wait for someone to return from vacation, but I can
commit here in advance, and I need to so that I can submit
https://android-git.corp.google.com/g/60790 which -- amongst other things --
makes lack of time zone data a hard failure, rather than just silently
pretending all time zones are UTC.)
Bug: 2870945
git cherry-pick --no-commit 18a859aff4
Change-Id: I66647e824c5fee9b8d2c63085e2a58e5910a5544
2010-08-18 00:33:52 -07:00
Dima Zavin
a716190241
linker: fix overwriting the real linker error string
...
Change-Id: Ia9165fd9aa1951b2bb81d0ac8f5bb3057aded8bd
Signed-off-by: Dima Zavin <dima@android.com>
2010-08-17 15:57:55 -07:00
Nick Pelly
b3765b2ee7
Add clean kernel headers for cpcap and hid.
...
Change-Id: I83d7395634eea8cb28c2fcf86c6855bb17f9fabb
Signed-off-by: Nick Pelly <npelly@google.com>
2010-08-16 15:31:01 -07:00
Jeff Hamilton
2304a0bf86
Fix pwrite to take a const void* instead of void* for the buffer.
...
Change-Id: I10b315946b8f8f7e34825410dfef37e0220edbee
2010-08-11 11:28:26 -05:00
Christopher Tate
caaf7ecd1c
am 1ff91085
: am 52e7d3d9
: Bulletproof leak dump against null hash entries
...
Merge commit '1ff910858c8ae5863761101c673a196a6a16bca3'
* commit '1ff910858c8ae5863761101c673a196a6a16bca3':
Bulletproof leak dump against null hash entries
2010-08-09 19:57:25 -07:00
Christopher Tate
1ff910858c
am 52e7d3d9
: Bulletproof leak dump against null hash entries
...
Merge commit '52e7d3d91ab6a5bab77c5dfb1ed47381fd52f9ba' into gingerbread-plus-aosp
* commit '52e7d3d91ab6a5bab77c5dfb1ed47381fd52f9ba':
Bulletproof leak dump against null hash entries
2010-08-09 19:53:32 -07:00
Christopher Tate
52e7d3d91a
Bulletproof leak dump against null hash entries
...
Previously, the malloc leak checking code would crash in qsort()
if null entries existed in its bookkeeping table. This change
makes the comparison function detect null entries and sort them
to the end safely.
Change-Id: I88244a7df1e289dd9d7992ce29606d505bd63079
2010-08-09 13:43:46 -07:00
Jim Huang
a172709259
bionic: Rename _ARM_HAVE_LDREX_STREX to __ARM_HAVE_LDREX_STREX for consistency
...
The patch follows the naming manner in existing macros with prefix
__ARM_HAVE.
Change-Id: I6763ce2bf3ee85fd1da112c719543061d8d19bf4
2010-08-09 05:35:11 +08:00
Rebecca Schultz Zavin
45fe7a42f8
Adding cleaned tegrafb header
...
Change-Id: Iba616e64cc26fb8c2d469bdd3f9f4b048391cc53
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2010-08-06 19:14:45 -07:00
Dima Zavin
63673645c4
libc: make lseek64 proto be glibc compatible (loff_t -> off64_t)
...
Change-Id: Ib79b99be9ca8d4b1f95ceeba416b6abc04187c3c
Signed-off-by: Dima Zavin <dima@android.com>
2010-08-06 11:47:29 -07:00
Thomas Tuttle
1a48b588c6
ublock: add cleaned version of linux/ublock.h to libc kernel headers
...
Change-Id: I8ebc7530690ff47f3160c72f42b8e0822f55a57e
2010-08-02 16:00:59 -07:00
Dima Zavin
19c23cc687
am 91af9e64
: am 18c5bcc6
: Revert "Set SA_RESTORER in sigaction()"
...
Merge commit '91af9e64b5d86dd5925c0fcfdb3f3db5a86aa43c'
* commit '91af9e64b5d86dd5925c0fcfdb3f3db5a86aa43c':
Revert "Set SA_RESTORER in sigaction()"
2010-07-30 14:21:43 -07:00