diff options
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 567a6f7bbeed..9a43ad792cfc 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -646,29 +646,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } | |||
| 646 | const typeof( ((type *)0)->member ) *__mptr = (ptr); \ | 646 | const typeof( ((type *)0)->member ) *__mptr = (ptr); \ |
| 647 | (type *)( (char *)__mptr - offsetof(type,member) );}) | 647 | (type *)( (char *)__mptr - offsetof(type,member) );}) |
| 648 | 648 | ||
| 649 | struct sysinfo; | ||
| 650 | extern int do_sysinfo(struct sysinfo *info); | ||
| 651 | |||
| 652 | #endif /* __KERNEL__ */ | ||
| 653 | |||
| 654 | #define SI_LOAD_SHIFT 16 | ||
| 655 | struct sysinfo { | ||
| 656 | long uptime; /* Seconds since boot */ | ||
| 657 | unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ | ||
| 658 | unsigned long totalram; /* Total usable main memory size */ | ||
| 659 | unsigned long freeram; /* Available memory size */ | ||
| 660 | unsigned long sharedram; /* Amount of shared memory */ | ||
| 661 | unsigned long bufferram; /* Memory used by buffers */ | ||
| 662 | unsigned long totalswap; /* Total swap space size */ | ||
| 663 | unsigned long freeswap; /* swap space still available */ | ||
| 664 | unsigned short procs; /* Number of current processes */ | ||
| 665 | unsigned short pad; /* explicit padding for m68k */ | ||
| 666 | unsigned long totalhigh; /* Total high memory size */ | ||
| 667 | unsigned long freehigh; /* Available high memory size */ | ||
| 668 | unsigned int mem_unit; /* Memory unit size in bytes */ | ||
| 669 | char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ | ||
| 670 | }; | ||
| 671 | |||
| 672 | #ifdef __CHECKER__ | 649 | #ifdef __CHECKER__ |
| 673 | #define BUILD_BUG_ON_NOT_POWER_OF_2(n) | 650 | #define BUILD_BUG_ON_NOT_POWER_OF_2(n) |
| 674 | #define BUILD_BUG_ON_ZERO(e) (0) | 651 | #define BUILD_BUG_ON_ZERO(e) (0) |
| @@ -736,4 +713,27 @@ extern int __build_bug_on_failed; | |||
| 736 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD | 713 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD |
| 737 | #endif | 714 | #endif |
| 738 | 715 | ||
| 716 | struct sysinfo; | ||
| 717 | extern int do_sysinfo(struct sysinfo *info); | ||
| 718 | |||
| 719 | #endif /* __KERNEL__ */ | ||
| 720 | |||
| 721 | #define SI_LOAD_SHIFT 16 | ||
| 722 | struct sysinfo { | ||
| 723 | long uptime; /* Seconds since boot */ | ||
| 724 | unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ | ||
| 725 | unsigned long totalram; /* Total usable main memory size */ | ||
| 726 | unsigned long freeram; /* Available memory size */ | ||
| 727 | unsigned long sharedram; /* Amount of shared memory */ | ||
| 728 | unsigned long bufferram; /* Memory used by buffers */ | ||
| 729 | unsigned long totalswap; /* Total swap space size */ | ||
| 730 | unsigned long freeswap; /* swap space still available */ | ||
| 731 | unsigned short procs; /* Number of current processes */ | ||
| 732 | unsigned short pad; /* explicit padding for m68k */ | ||
| 733 | unsigned long totalhigh; /* Total high memory size */ | ||
| 734 | unsigned long freehigh; /* Available high memory size */ | ||
| 735 | unsigned int mem_unit; /* Memory unit size in bytes */ | ||
| 736 | char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ | ||
| 737 | }; | ||
| 738 | |||
| 739 | #endif | 739 | #endif |
