Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109a1f32 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

sysinfo: Use explicit types in <linux/sysinfo.h> 



Change <linux/sysinfo.h> to use explicitly sized types.  Replace
long/unsigned long with __kernel_[u]long_t so that a non-legacy 32-bit
ABI running on a 64-bit kernel can export those as 64-bit types.

Originally-by: default avatarH. J. Lu <hjl.tools@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 1f5e27a9

include/linux/sysinfo.h

+16 −14
Original line number Diff line number Diff line 
#ifndef _LINUX_SYSINFO_H

#define _LINUX_SYSINFO_H



#include <linux/types.h>



#define SI_LOAD_SHIFT	16

struct sysinfo {

	long uptime;			/* Seconds since boot */

	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */

	unsigned long totalram;		/* Total usable main memory size */

	unsigned long freeram;		/* Available memory size */

	unsigned long sharedram;	/* Amount of shared memory */

	unsigned long bufferram;	/* Memory used by buffers */

	unsigned long totalswap;	/* Total swap space size */

	unsigned long freeswap;		/* swap space still available */

	unsigned short procs;		/* Number of current processes */

	unsigned short pad;		/* explicit padding for m68k */

	unsigned long totalhigh;	/* Total high memory size */

	unsigned long freehigh;		/* Available high memory size */

	unsigned int mem_unit;		/* Memory unit size in bytes */

	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */

	__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 */