Ben Cheng
2cda66116c
am a458b609
: am f89f1eaa
: Merge "Refresh libc/kernel/common/linux/auxvec.h"
...
* commit 'a458b609dbbff789a58fe4d2710af947b20d7e29':
Refresh libc/kernel/common/linux/auxvec.h
2013-10-16 16:58:47 -07:00
Ben Cheng
76b795a8ba
Refresh libc/kernel/common/linux/auxvec.h
...
Change-Id: If9bb50a2f233cdb60e91bd979876edb917e0f66d
2013-10-16 16:50:14 -07:00
Ben Cheng
a5e5fad478
am 29351c80
: am 3fdd6b83
: Merge "Add processed uapi kernel headers (common and aarch64-specific)"
...
* commit '29351c8091c4b7338bd47fb6b3e5aed94a2abf32':
Add processed uapi kernel headers (common and aarch64-specific)
2013-10-16 16:33:50 -07:00
Ben Cheng
655a7c081f
Add processed uapi kernel headers (common and aarch64-specific)
...
Change-Id: If0be7b83bd8fe7cb02472d173f7c452aabf61124
2013-10-16 16:09:24 -07:00
Elliott Hughes
5d641bcf70
am f5dcdfc4
: am 6dee3b9a
: Merge "Add x86_64 to the bionic headers."
...
* commit 'f5dcdfc438684bbe93e398b6551f915fe3fe10bf':
Add x86_64 to the bionic headers.
2013-09-30 18:45:57 -07:00
Elliott Hughes
d3e64a3f40
Add x86_64 to the bionic headers.
...
Manual changes:
cpp.py: cope with macros that refer to other macros.
defaults.py: x86 no longer always implies __i386__; use __i386__ to replace
the kernel CONFIG_X86_32 flag.
asm/page.h: the upstream page.h isn't a uapi header and no longer includes
the stuff we were using it for. Let's just have our own static file, since
it's the same for all our architectures (both 32- and 64-bit).
sys/select.h: we used to use the various FD_SET-related macros from the
kernel header files, but they've gone. Adjust by adding trivial equivalent
definitions.
Automated changes:
libc/kernel/arch-x86, libc/kernel/common: regenerated from
external/kernel-headers.
Change-Id: I84fc0ed52dc742e043b4ae300fd3b58ee99b7fcd
2013-09-30 18:42:13 -07:00
Michael Wright
18c2cc68e8
am 92d512f6
: am c612a133
: Merge "Update capability.h"
...
* commit '92d512f6cf273d6d9e281dc362cc25cf8892b3f9':
Update capability.h
2013-09-25 16:35:33 -07:00
Michael Wright
c612a133dc
Merge "Update capability.h"
2013-09-25 23:29:32 +00:00
Michael Wright
8bd5aa6a76
Update capability.h
...
To upstream SHA 6e4664525b1db28f8c4e1130957f70a94c19213e (v3.11)
Change-Id: Ic0d95464bc9001246df898489b2ea603a97ca231
2013-09-25 14:55:55 -07:00
Elliott Hughes
2f81ac8443
am 4808f052
: am c8d98679
: Merge "Update taskstats.h from Linux 3.11.1"
...
* commit '4808f05238d66ba474c6d33da066da799d4e6cf3':
Update taskstats.h from Linux 3.11.1
2013-09-24 07:37:48 -07:00
Sami Kyostila
50a1b776fd
Update taskstats.h from Linux 3.11.1
...
Change-Id: I50853efe20fa2524f6288f78505a774a72071367
2013-09-23 11:01:59 +01:00
Nick Kralevich
df3ff45216
am 5a58a1e0
: am bef76b54
: Merge "Add linux/sock_diag.h"
...
* commit '5a58a1e0abf51402170abeb6feaceb53915b8a6e':
Add linux/sock_diag.h
2013-09-20 08:24:59 -07:00
Nick Kralevich
8470f01cca
Add linux/sock_diag.h
...
This file was generated using bionic/libc/kernel/tools/update_all.py
Change-Id: Iad33e96253978ed9a76d429d66eed9f245685c10
2013-09-19 16:44:53 -07:00
Nick Kralevich
d85d0b4c23
am 0c12f125
: am 814bbd52
: Merge "Update netlink.h from tip-of-tree external/kernel-headers"
...
* commit '0c12f125cfc90f83475532e64aa7f533e02e3798':
Update netlink.h from tip-of-tree external/kernel-headers
2013-09-18 21:09:22 -07:00
Nick Kralevich
45e52faeb7
Update netlink.h from tip-of-tree external/kernel-headers
...
This file was generated using bionic/libc/kernel/tools/update_all.py
The only change is a new netlink.h file, from external/kernel-headers.
Please see the commit message there for details.
Change-Id: I83645b88f0baff838131197913ebd70be69abd3f
2013-09-18 17:14:02 -07:00
Michael Wright
a71f676b47
am 7b197ea1
: am 5e4a2f31
: Merge "Update kernel input headers"
...
* commit '7b197ea1107055bcdf0a15f285495c5d70a3555c':
Update kernel input headers
2013-08-14 13:48:18 -07:00
Michael Wright
55bdef8677
Update kernel input headers
...
To upstream SHA e1c85813f3832b909d1c4309b213bb0a52c79ba5
Change-Id: I72ee3d59c105bc0252b5ca0c49c569d12ec685d1
2013-08-14 13:30:20 -07:00
Colin Cross
15d2784fc1
Merge "Kexec header generated from linux header 3.10"
2013-07-18 17:41:09 +00:00
Szymon Starzycki
674be7e0fc
Kexec header generated from linux header 3.10
...
Change-Id: Iac26fcc6e0e25905ab52dba91bec16a4fb479d43
2013-07-15 13:51:56 -07:00
Elliott Hughes
24400ac1e3
am e63ea6ac
: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit 'e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:12:32 -07:00
Elliott Hughes
e42e51d563
Clean up <sys/mount.h>/<linux/fs.h> duplication.
...
Roll on uapi...
Bug: 6340120
Change-Id: Ic9521905683946e836574e4d768e34853ea777fa
2013-07-03 14:58:04 -07:00
Elliott Hughes
a8b954c51e
am de2781d9
: Merge changes I01345c23,I3b57517c
...
* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 13:39:16 -07:00
Lorenzo Colitti
d7b0d6e1e1
Update linux/types.h to linux 2.6.20.
...
This picks up the source kernel header change
I984154487c38f6fa827bd78234f7fc2e4e1c383f .
Bug: 9469682
Change-Id: I3b57517cc6442ba4d0b8003d7398617e8226233f
2013-07-03 13:15:20 -07:00
Elliott Hughes
562804ff87
am f0f4fa3f
: Merge "libc: add timerfd calls"
...
* commit 'f0f4fa3fb1ea8623b1e1bc59f7967e0470c8e532':
libc: add timerfd calls
2013-05-14 14:59:16 -07:00
Todd Poynor
4200e6203a
libc: add timerfd calls
...
(cherry-pick of 04c0ac14a49e0969333008a9522b64046d58fbdc.)
Change-Id: I06d0b6c2a8781602362b81f48faf1cca76b9ec05
2013-05-14 14:45:02 -07:00
Todd Poynor
04c0ac14a4
libc: add timerfd calls
...
Change-Id: Id63b907266d5b87c7422a51d393a1430551ca33d
2013-05-13 12:06:15 -07:00
Nick Kralevich
89357dc730
am c6dc62f0
: Merge "[NETFILTER]: Fix iptables ABI breakage"
...
* commit 'c6dc62f09c814b9688aee83e80dcfe80cb0ef604':
[NETFILTER]: Fix iptables ABI breakage
2013-04-29 12:51:35 -07:00
Nick Kralevich
e66ad7809e
[NETFILTER]: Fix iptables ABI breakage
...
Pick up Linux kernel patch 2748e5dec7ca8a3804852c7c4171f9156384d15c
from 2007
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2748e5dec7ca8a3804852c7c4171f9156384d15c
[NETFILTER]: Fix iptables ABI breakage on (at least) CRIS
With the introduction of x_tables we accidentally broke compatibility
by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of
XT_TABLE_MAXNAMELEN, which is two bytes larger.
On most architectures it doesn't really matter since we don't have
any tables with names that long in the kernel and the structure
layout didn't change because of alignment requirements of following
members. On CRIS however (and other architectures that don't align
data) this changed the structure layout and thus broke compatibility
with old iptables binaries.
Changing it back will break compatibility with binaries compiled
against recent kernels again, but since the breakage has only been
there for three releases this seems like the better choice.
Change-Id: Ie9552b25892109c7042b9752132dc8ebd3552dc3
2013-04-29 12:31:01 -07:00
Eric Laurent
ccaa0fa6e9
sound: Add ALSA compressed API headers
...
Added the following headers for ALSA compressed
user space API:
- sound/compress_offload.h
- sound/compress_params.h
Change-Id: I9584c12acdadf31546d2921393b93d491e54a8d3
2013-04-09 09:37:44 -07:00
Ken Sumrall
ce636ca088
Update processed linux/fs.h header file
...
Need to get the defintion of the FITRIM ioctl(). Also need
to update the blk_types.h header file as fs.h includes it.
Change-Id: I617622b620925942dc5aead9e49f8e17d17e5d74
2013-03-27 16:05:22 -07:00
Ken Sumrall
887049e46b
Merge "Update processed linux/fs.h header file" into jb-mr2-dev
2013-03-27 21:15:29 +00:00
Ken Sumrall
d74a0ffba8
Update processed linux/fs.h header file
...
Need to get the defintion of the FITRIM ioctl(). Also need
to update the blk_types.h header file as fs.h includes it.
Change-Id: I617622b620925942dc5aead9e49f8e17d17e5d74
2013-03-22 02:12:46 -07:00
Kito Cheng
8f7120bbac
Drop unnecessary execution permission for .cpp/.c/.h
...
Change-Id: I9ac2b9d8f6bdb4fab8962210c5ec8f9c3e8c0ebf
2013-03-22 10:28:15 +08:00
Elliott Hughes
f557e90b34
am 2f44c05b
: am ec706c24
: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit '2f44c05bc54073aa6decfc5d933b7e77e7ce5768':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-12 17:55:54 -07:00
Elliott Hughes
2f44c05bc5
am ec706c24
: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit 'ec706c24acb4d1db6a583a57b76adfb9250d39eb':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-12 17:54:00 -07:00
Elliott Hughes
9aceab5015
Use the kernel's MAX_ERRNO in the syscall stubs.
...
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Iaabf7025b153e96dc5eca231a33a32d4cb7d8116
2013-03-12 17:43:58 -07:00
Jean-Baptiste Queru
818b1423d2
Fix mako builds. Do not merge.
...
Revert "Regenerate msm_ion.h."
This reverts commit 3fac8f7f49
.
2013-02-20 12:47:58 -08:00
Nick Kralevich
f93de61e7b
am b128f49f
: Merge "bionic: Add securebits.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b128f49fd58beecc5287ddff6366a97e5aa2e468':
bionic: Add securebits.h
2013-02-14 15:05:22 -08:00
Nick Kralevich
0276656daa
bionic: Add securebits.h
...
Change-Id: I2031796b9be117558b80246498b29736492cf269
2013-02-14 14:03:37 -08:00
Nick Kralevich
5eef90699d
am f156b901
: am fa75fce5
: Merge "update xattr.h"
...
# Via Android Git Automerger (1) and others
* commit 'f156b901b1e51971192c573444b5b7f63e6bc22a':
update xattr.h
2013-02-07 20:29:43 -08:00
Nick Kralevich
f156b901b1
am fa75fce5
: Merge "update xattr.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fa75fce56641255a571b8b472f010863c3095b70':
update xattr.h
2013-02-07 16:50:08 -08:00
Nick Kralevich
b184d3ba33
update xattr.h
...
Change-Id: Ibd91167ba56e2692359b92fe3108da271f0c2e38
2013-02-07 16:23:16 -08:00
Elliott Hughes
96a5819afb
am 704d9c5b
: am a9dd3670
: Merge "Restore bionic\'s <linux/elf-em.h>."
...
# Via Android Git Automerger (1) and others
* commit '704d9c5b45515cc2421bfe3b37c93117da0a1334':
Restore bionic's <linux/elf-em.h>.
2013-02-04 11:29:24 -08:00
Elliott Hughes
ada6de673b
am a1821f01
: Merge "Regenerate msm_ion.h."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a1821f015306e221e6a51e5acc27176ae2d72f6b':
Regenerate msm_ion.h.
2013-02-04 10:52:16 -08:00
Elliott Hughes
3fac8f7f49
Regenerate msm_ion.h.
...
Bug: 8000377
Change-Id: If496d9972cb8aebfc996ac641aa762220aa71f3b
2013-02-01 18:21:08 -08:00
Brian Muramatsu
322c7edba3
Remove MSM headers
...
Bug 7115545
These headers will be moved to hardware/qcom/msm8960 project.
Change-Id: Idb970c196be239e186e0a406d19135aa27225aca
2013-02-01 16:28:40 -08:00
Elliott Hughes
704d9c5b45
am a9dd3670
: Merge "Restore bionic\'s <linux/elf-em.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a9dd36702f4a9d65d084387050b688b8965b13b3':
Restore bionic's <linux/elf-em.h>.
2013-02-01 16:19:37 -08:00
Elliott Hughes
a48e1b2aac
Restore bionic's <linux/elf-em.h>.
...
Used by <linux/audit.h>.
Change-Id: Ica4ebb7f52a7fce13c52fdff35e187ded3939382
2013-02-01 16:10:28 -08:00
Elliott Hughes
0243962d20
am 9d43c079
: am 4e882503
: am a990cf5b
: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Android Git Automerger (2) and others
* commit '9d43c079875ebd2540daccb180e9d6d0fa06061d':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:33:52 -08:00
Elliott Hughes
4e8825038e
am a990cf5b
: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a990cf5b3392c5aef767aee1e67b4d7ef651afc6':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:28:59 -08:00