mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 07:15:06 +00:00
596b1c94aa
iproute2 contains a bunch of kernel headers, including uapi ones. Android's libc uses uapi headers almost directly, and uses a script to fix kernel types that don't match what userspace expects. For example: https://issuetracker.google.com/36987220 reports that our struct ip_mreq_source contains "__be32 imr_multiaddr" rather than "struct in_addr imr_multiaddr". The script addresses this by replacing the uapi struct definition with a #include <bits/ip_mreq.h> which contains the traditional userspace definition. Unfortunately, when we compile iproute2, this definition conflicts with the one in iproute2's linux/in.h. Historically we've just solved this problem by running "git rm" on all the iproute2 include/linux headers that break Android's libc. However, deleting the files in this way makes it harder to keep up with upstream, because every upstream change to an include file causes a merge conflict with the delete. This patch fixes the problem by moving the iproute2 linux headers from include/linux to include/uapi/linux. Tested: compiles on ubuntu trusty (glibc) Signed-off-by: Elliott Hughes <enh@google.com> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
25 lines
986 B
C
25 lines
986 B
C
#ifndef _LINUX_SYSINFO_H
|
|
#define _LINUX_SYSINFO_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define SI_LOAD_SHIFT 16
|
|
struct sysinfo {
|
|
__kernel_long_t uptime; /* Seconds since boot */
|
|
__kernel_ulong_t loads[3]; /* 1, 5, and 15 minute load averages */
|
|
__kernel_ulong_t totalram; /* Total usable main memory size */
|
|
__kernel_ulong_t freeram; /* Available memory size */
|
|
__kernel_ulong_t sharedram; /* Amount of shared memory */
|
|
__kernel_ulong_t bufferram; /* Memory used by buffers */
|
|
__kernel_ulong_t totalswap; /* Total swap space size */
|
|
__kernel_ulong_t freeswap; /* swap space still available */
|
|
__u16 procs; /* Number of current processes */
|
|
__u16 pad; /* Explicit padding for m68k */
|
|
__kernel_ulong_t totalhigh; /* Total high memory size */
|
|
__kernel_ulong_t freehigh; /* Available high memory size */
|
|
__u32 mem_unit; /* Memory unit size in bytes */
|
|
char _f[20-2*sizeof(__kernel_ulong_t)-sizeof(__u32)]; /* Padding: libc5 uses this.. */
|
|
};
|
|
|
|
#endif /* _LINUX_SYSINFO_H */
|