diff options
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5db52d0ff1d4..a5375e7f3fea 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_KERNEL_H | 1 | #ifndef _LINUX_KERNEL_H |
2 | #define _LINUX_KERNEL_H | 2 | #define _LINUX_KERNEL_H |
3 | 3 | ||
4 | #include <linux/sysinfo.h> | ||
5 | |||
4 | /* | 6 | /* |
5 | * 'kernel.h' contains some often-used function prototypes etc | 7 | * 'kernel.h' contains some often-used function prototypes etc |
6 | */ | 8 | */ |
@@ -698,27 +700,8 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } | |||
698 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD | 700 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD |
699 | #endif | 701 | #endif |
700 | 702 | ||
701 | struct sysinfo; | ||
702 | extern int do_sysinfo(struct sysinfo *info); | 703 | extern int do_sysinfo(struct sysinfo *info); |
703 | 704 | ||
704 | #endif /* __KERNEL__ */ | 705 | #endif /* __KERNEL__ */ |
705 | 706 | ||
706 | #define SI_LOAD_SHIFT 16 | ||
707 | struct sysinfo { | ||
708 | long uptime; /* Seconds since boot */ | ||
709 | unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ | ||
710 | unsigned long totalram; /* Total usable main memory size */ | ||
711 | unsigned long freeram; /* Available memory size */ | ||
712 | unsigned long sharedram; /* Amount of shared memory */ | ||
713 | unsigned long bufferram; /* Memory used by buffers */ | ||
714 | unsigned long totalswap; /* Total swap space size */ | ||
715 | unsigned long freeswap; /* swap space still available */ | ||
716 | unsigned short procs; /* Number of current processes */ | ||
717 | unsigned short pad; /* explicit padding for m68k */ | ||
718 | unsigned long totalhigh; /* Total high memory size */ | ||
719 | unsigned long freehigh; /* Available high memory size */ | ||
720 | unsigned int mem_unit; /* Memory unit size in bytes */ | ||
721 | char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ | ||
722 | }; | ||
723 | |||
724 | #endif | 707 | #endif |