Revert "Update bionic kernel headers using update_all.py"
This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
diff --git a/libc/kernel/common/linux/shm.h b/libc/kernel/common/linux/shm.h
index ecee3e8..a7056db 100644
--- a/libc/kernel/common/linux/shm.h
+++ b/libc/kernel/common/linux/shm.h
@@ -7,75 +7,68 @@
*** structures, and macros generated from the original header, and thus,
*** contains no copyrightable information.
***
- *** To edit the content of this header, modify the corresponding
- *** source file (e.g. under external/kernel-headers/original/) then
- *** run bionic/libc/kernel/tools/update_all.py
- ***
- *** Any manual change here will be lost the next time this script will
- *** be run. You've been warned!
- ***
****************************************************************************
****************************************************************************/
#ifndef _LINUX_SHM_H_
#define _LINUX_SHM_H_
+
#include <linux/ipc.h>
#include <linux/errno.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#include <asm/page.h>
+
#define SHMMAX 0x2000000
#define SHMMIN 1
#define SHMMNI 4096
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16))
#define SHMSEG SHMMNI
+
#include <asm/shmparam.h>
+
struct shmid_ds {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct ipc_perm shm_perm;
int shm_segsz;
__kernel_time_t shm_atime;
__kernel_time_t shm_dtime;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
__kernel_time_t shm_ctime;
__kernel_ipc_pid_t shm_cpid;
__kernel_ipc_pid_t shm_lpid;
unsigned short shm_nattch;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
unsigned short shm_unused;
void *shm_unused2;
void *shm_unused3;
};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+
#include <asm/shmbuf.h>
+
#define SHM_R 0400
#define SHM_W 0200
+
#define SHM_RDONLY 010000
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SHM_RND 020000
#define SHM_REMAP 040000
#define SHM_EXEC 0100000
+
#define SHM_LOCK 11
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SHM_UNLOCK 12
+
#define SHM_STAT 13
#define SHM_INFO 14
+
struct shminfo {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
int shmmax;
int shmmin;
int shmmni;
int shmseg;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
int shmall;
};
+
struct shm_info {
int used_ids;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
unsigned long shm_tot;
unsigned long shm_rss;
unsigned long shm_swp;
unsigned long swap_attempts;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
unsigned long swap_successes;
};
+
#endif