126601dd3f
This patch fixes an issue where 64-bit hreaders are incorrectly included in kernel headers. For example, file "libc/kernel/arch-x86/asm/io.h" incorreclty includes "io_64.h" (missing, BTW) instead of "io_32.h". The reason is because CONFIG_X86_32 isn't considered pre-defined in "kernel_default_arch_macros" for x86, and clean_header.py doesn't look at it at all anyway (ie. __i386__ is also ignored, but it's okay since x86 cross compiler defines it back) Fixed 2 tools/*py, README.TXT, and refreshed libc/kernel headers Change-Id: Iac834cc8b3548f055d3f2a214af36072dd679fe8
55 lines
2.1 KiB
C
55 lines
2.1 KiB
C
/****************************************************************************
|
|
****************************************************************************
|
|
***
|
|
*** This header was automatically generated from a Linux kernel header
|
|
*** of the same name, to make information necessary for userspace to
|
|
*** call into the kernel available to libc. It contains only constants,
|
|
*** 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 _ASM_X86_SHMBUF_H
|
|
#define _ASM_X86_SHMBUF_H
|
|
struct shmid64_ds {
|
|
struct ipc64_perm shm_perm;
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
size_t shm_segsz;
|
|
__kernel_time_t shm_atime;
|
|
unsigned long __unused1;
|
|
__kernel_time_t shm_dtime;
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
unsigned long __unused2;
|
|
__kernel_time_t shm_ctime;
|
|
unsigned long __unused3;
|
|
__kernel_pid_t shm_cpid;
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
__kernel_pid_t shm_lpid;
|
|
unsigned long shm_nattch;
|
|
unsigned long __unused4;
|
|
unsigned long __unused5;
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
};
|
|
struct shminfo64 {
|
|
unsigned long shmmax;
|
|
unsigned long shmmin;
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
unsigned long shmmni;
|
|
unsigned long shmseg;
|
|
unsigned long shmall;
|
|
unsigned long __unused1;
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
unsigned long __unused2;
|
|
unsigned long __unused3;
|
|
unsigned long __unused4;
|
|
};
|
|
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
|
|
#endif
|