generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update kernel headers to v3.14.

Browse Source 
Other changes:
- Modify update_all.py to skip ion header files when importing into aosp.
- Fix generate_uapi_headers.sh to handle imports from a linux-stable kernel.

Change-Id: I1ad81b9ccb063c21740f9875f2cc1238052cd4b3
This commit is contained in:
Christopher Ferris
2014-07-09 15:33:25 -07:00
parent 4c199170a8
commit 38062f954c
175 changed files with 8703 additions and 3694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libc/kernel/uapi/linux/shm.h
View File

@@ -69,12 +69,12 @@ struct shminfo {
};
struct shm_info {
int used_ids;
unsigned long shm_tot;
__kernel_ulong_t shm_tot;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
unsigned long shm_rss;
unsigned long shm_swp;
unsigned long swap_attempts;
unsigned long swap_successes;
__kernel_ulong_t shm_rss;
__kernel_ulong_t shm_swp;
__kernel_ulong_t swap_attempts;
__kernel_ulong_t swap_successes;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif