Elliott Hughes
d1214a7ec5
am c566f35a
: am ab0b0cdf
: Merge "Finish <sys/user.h>."
...
* commit 'c566f35af462de45d119fb3b024e3db56d76927a':
Finish <sys/user.h>.
2013-11-27 16:55:35 +00:00
Elliott Hughes
867e25105d
am 3b9aba55
: am 98c910fb
: Merge "Fix the order of arguments to sys_clone for x86."
...
* commit '3b9aba55490ad4bc97c17c4a4e9acd51de1d8958':
Fix the order of arguments to sys_clone for x86.
2013-11-27 16:55:34 +00:00
Elliott Hughes
bef09fac15
am cb88d966
: am 6ae2f22d
: Merge "Work around CLONE_SETTLS being weird on x86."
...
* commit 'cb88d966b0b4c643ddd8c108f75478db7aa4f5f9':
Work around CLONE_SETTLS being weird on x86.
2013-11-27 16:55:34 +00:00
Elliott Hughes
15a7a13ecf
am a1d1a46e
: am 1c057607
: Merge "Fix _exit_with_stack_teardown for x86."
...
* commit 'a1d1a46ef635e559bbc4a4548ae28c84102d6f0b':
Fix _exit_with_stack_teardown for x86.
2013-11-27 16:55:34 +00:00
Elliott Hughes
c566f35af4
am ab0b0cdf
: Merge "Finish <sys/user.h>."
...
* commit 'ab0b0cdf1b07eb25ad89e0de08d4b3fd453602fe':
Finish <sys/user.h>.
2013-11-27 08:12:24 -08:00
Elliott Hughes
3b9aba5549
am 98c910fb
: Merge "Fix the order of arguments to sys_clone for x86."
...
* commit '98c910fb217a5c094e3101e57c52a618beaa23db':
Fix the order of arguments to sys_clone for x86.
2013-11-27 08:12:24 -08:00
Elliott Hughes
ab0b0cdf1b
Merge "Finish <sys/user.h>."
2013-11-27 04:51:35 +00:00
Elliott Hughes
ab797cb4fd
Finish <sys/user.h>.
...
Change-Id: I1d97d7fa3d5be2ff4728571ed5376705a27091ec
2013-11-26 17:57:31 -08:00
Elliott Hughes
98c910fb21
Merge "Fix the order of arguments to sys_clone for x86."
2013-11-27 00:34:44 +00:00
Elliott Hughes
99c393dff3
Fix the order of arguments to sys_clone for x86.
...
Unlike x86-64, x86's arguments are just like every other
architecture's.
Change-Id: Ic6da23f2a70599683b68e7e12ab9ba061e0b349c
2013-11-26 16:20:50 -08:00
Elliott Hughes
cb88d966b0
am 6ae2f22d
: Merge "Work around CLONE_SETTLS being weird on x86."
...
* commit '6ae2f22dc091844f2cf4a1de65d3ff6b225c2635':
Work around CLONE_SETTLS being weird on x86.
2013-11-26 14:44:12 -08:00
Elliott Hughes
6ae2f22dc0
Merge "Work around CLONE_SETTLS being weird on x86."
2013-11-26 22:36:38 +00:00
Elliott Hughes
a1d1a46ef6
am 1c057607
: Merge "Fix _exit_with_stack_teardown for x86."
...
* commit '1c057607d89229f5effaf1acf2ecde24ece41389':
Fix _exit_with_stack_teardown for x86.
2013-11-26 14:01:08 -08:00
Elliott Hughes
80906141f7
Work around CLONE_SETTLS being weird on x86.
...
Unlike other architectures, on x86 (but not x86-64), CLONE_SETTLS
takes a pointer to a struct user_desc instead of a pointer to the
TLS itself. Rather than have to deal with this here, let's just use
the old __set_tls mechanism we used to use (and still use for the
main thread on all architectures, so it's not going away any time
soon).
Bug: 11826724
Change-Id: I02a27939a73ae6cea1134a3f4c1dd7eafea479da
2013-11-26 13:57:21 -08:00
Elliott Hughes
1c057607d8
Merge "Fix _exit_with_stack_teardown for x86."
2013-11-26 21:51:48 +00:00
Elliott Hughes
9dec707bd6
Fix _exit_with_stack_teardown for x86.
...
Change-Id: Ife8f9c538c86f7c0017143015d5ee849a99b625b
2013-11-26 13:48:24 -08:00
Elliott Hughes
ca80f099a2
Merge "Regenerate the bionic headers to match external/kernel-headers."
2013-11-25 22:19:23 +00:00
Elliott Hughes
1c9d30540e
am 6fcdba7a
: am a98fff25
: Merge "Make <sys/timerfd.h> standalone."
...
* commit '6fcdba7a12eb1fdca200d725d09d27a69ee7b78a':
Make <sys/timerfd.h> standalone.
2013-11-25 14:09:32 -08:00
Elliott Hughes
356a4e4a32
Regenerate the bionic headers to match external/kernel-headers.
...
(This undoes the AOSP-only ion.h hack.)
Bug: 11859767
Change-Id: Id863c70d63b2716ae22cafd7ddb1163bbc7a3d11
2013-11-25 14:09:12 -08:00
Elliott Hughes
6fcdba7a12
am a98fff25
: Merge "Make <sys/timerfd.h> standalone."
...
* commit 'a98fff25c33b2cb697c6bf75b3d17612427b6db3':
Make <sys/timerfd.h> standalone.
2013-11-25 14:07:26 -08:00
Elliott Hughes
ee6b6f167a
am aee38bc0
: am 5a52bd34
: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
...
* commit 'aee38bc05ff0cd1294d079909c27732249507abd':
Regenerate the bionic kernel headers to match external/kernel-headers.
2013-11-25 14:05:10 -08:00
Elliott Hughes
aee38bc05f
am 5a52bd34
: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
...
* commit '5a52bd34f1b7e49e28b31dd2c186de8bdef47451':
Regenerate the bionic kernel headers to match external/kernel-headers.
2013-11-25 14:01:39 -08:00
Elliott Hughes
a98fff25c3
Merge "Make <sys/timerfd.h> standalone."
2013-11-25 22:00:10 +00:00
Elliott Hughes
e96d4bffe5
Make <sys/timerfd.h> standalone.
...
There's no uapi timerfd.h.
Bug: 11559337
Change-Id: I77a4b1365fdcf2c9f18673b11341a165e54b4bbd
2013-11-25 13:58:38 -08:00
Elliott Hughes
5a52bd34f1
Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
2013-11-25 21:56:10 +00:00
Elliott Hughes
c43d16a458
Regenerate the bionic kernel headers to match external/kernel-headers.
...
Bug: 11859767
Change-Id: I3d746188a1c4bdf8db1358521438435d3e63dbac
2013-11-25 13:50:55 -08:00
Christopher Ferris
2884789cfa
am cf8500fd
: am cda0c61d
: am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit 'cf8500fd4359bd026829bdfd0dc4968ed07cc842':
Delete non-uapi headers.
2013-11-24 00:27:51 -08:00
Christopher Ferris
cf8500fd43
am cda0c61d
: am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit 'cda0c61dc7490236afb697ac50c900cffe2cb640':
Delete non-uapi headers.
2013-11-24 00:24:43 -08:00
Christopher Ferris
cda0c61dc7
am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit '14d6be45b960f8fbb039bd946e22ce406e8b65c3':
Delete non-uapi headers.
2013-11-24 00:20:23 -08:00
Christopher Ferris
14d6be45b9
Merge "Delete non-uapi headers."
2013-11-24 08:16:25 +00:00
Christopher Ferris
7b29d586bb
am 76115fe9
: am dd1d4f1c
: am 985c3fbb
: Merge "Move arm user.h definitions to sys/user.h."
...
* commit '76115fe9a0a8a2a7f57abcc3fea4e2be079cb2e6':
Move arm user.h definitions to sys/user.h.
2013-11-23 12:41:04 -08:00
Christopher Ferris
59a6012367
am 30aebed9
: am 038919d3
: am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '30aebed98ab66329d62e0884209fd9d04a8b056f':
Update script to copy in extra generated files.
2013-11-23 12:41:04 -08:00
Christopher Ferris
76115fe9a0
am dd1d4f1c
: am 985c3fbb
: Merge "Move arm user.h definitions to sys/user.h."
...
* commit 'dd1d4f1cfd6c4c6eca27cc2f7f477e0518dc0924':
Move arm user.h definitions to sys/user.h.
2013-11-23 12:36:55 -08:00
Christopher Ferris
30aebed98a
am 038919d3
: am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '038919d37c01e52f5a976247f482daacfa206393':
Update script to copy in extra generated files.
2013-11-23 12:36:51 -08:00
Christopher Ferris
dd1d4f1cfd
am 985c3fbb
: Merge "Move arm user.h definitions to sys/user.h."
...
* commit '985c3fbb3b1dabfa799e2a8c102867349bcb5a76':
Move arm user.h definitions to sys/user.h.
2013-11-23 08:02:04 -08:00
Christopher Ferris
e5a9200534
Delete non-uapi headers.
...
Update headers and delete non-uapi headers that have been removed from
external/kernel-headers project.
Change-Id: I9ed9632a941095fe1bf3b207bafe1151f00de033
2013-11-23 08:01:25 -08:00
Christopher Ferris
985c3fbb3b
Merge "Move arm user.h definitions to sys/user.h."
2013-11-23 15:59:57 +00:00
The Android Open Source Project
220631ee3a
am 3f3788c3
: am f00c938c
: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242\' into HEAD
...
* commit '3f3788c339488d106830718174341380ddd5193a':
2013-11-22 19:31:07 -08:00
Christopher Ferris
363390eaff
Move arm user.h definitions to sys/user.h.
...
There is no uapi user.h file for arm, it was included by accident.
Move the user struct definition into the file to follow the pattern
used by the other architectures.
Change-Id: Ib9cea0deca551c9268382ddd6de9202fd32ef941
2013-11-22 18:00:09 -08:00
The Android Open Source Project
3f3788c339
am f00c938c
: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242\' into HEAD
...
* commit 'f00c938c7f5887981d724bf2dd9989ee0af08332':
2013-11-22 17:30:47 -08:00
Christopher Ferris
038919d37c
am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '507f95e22b39fb58b9ffbba38ab593475b926af5':
Update script to copy in extra generated files.
2013-11-22 17:22:10 -08:00
Christopher Ferris
507f95e22b
Merge "Update script to copy in extra generated files."
2013-11-23 01:17:16 +00:00
Christopher Ferris
b4091e69f1
Update script to copy in extra generated files.
...
There are files in generated/asm that simply include asm-generic files. The
script now copies any file in generated/asm that also exists in asm-generic.
Change-Id: I075161c68624e9e9e81797224831988ce02220eb
2013-11-22 17:04:34 -08:00
The Android Open Source Project
f00c938c7f
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
...
Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761
2013-11-22 13:38:33 -08:00
Christopher Ferris
bbbf505c1d
am e3bc2254
: am a626e4d8
: am 26f0e54a
: Merge "Script to grab uapi headers from android kernel."
...
* commit 'e3bc2254138e92d1b4746709ec355a5bd43bbccd':
Script to grab uapi headers from android kernel.
2013-11-21 23:00:03 -08:00
Elliott Hughes
6211255a6b
am 68a4187c
: am 50f6b836
: am fa7b48bf
: Merge "Regenerate uapi header files."
...
* commit '68a4187c4a88a885b36412607797e7ca65662968':
Regenerate uapi header files.
2013-11-21 23:00:02 -08:00
Elliott Hughes
3eba84eee0
am 81768e18
: am 5e818b33
: am 880d0e6c
: Merge "Remove hidden __reboot from header"
...
* commit '81768e18bb2e7c29917e1f4c188285c64498f61d':
Remove hidden __reboot from header
2013-11-21 23:00:01 -08:00
Elliott Hughes
6bc95b6906
am 8acd5dd2
: am 84336795
: am eec57b37
: Merge "Add support for the ternary operator to the header scrubber."
...
* commit '8acd5dd2f82ecbf57c275528d5f2e5db0ef60a34':
Add support for the ternary operator to the header scrubber.
2013-11-21 23:00:01 -08:00
Elliott Hughes
5d352e6acd
am 5a2526ac
: am cb478f23
: am d4143c8e
: Merge "Fix useconds_t for LP64."
...
* commit '5a2526ac629802ff22f71d516f7979f1f4a4c34d':
Fix useconds_t for LP64.
2013-11-21 23:00:00 -08:00
Elliott Hughes
57f4718cfc
am 03adedfc
: am a18a01f5
: am 15a64948
: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit '03adedfc3c8d25939d8799ed2ce9292b063d8bc7':
Remove obsolete kernel/arch-mips headers.
2013-11-21 22:59:59 -08:00