mirror of
https://github.com/steev/efikamx.git
synced 2026-02-17 21:50:24 +00:00
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
diff -ruN procps-3.2.8/proc/sysinfo.c procps-3.2.8.linux_version_init/proc/sysinfo.c
|
|
--- procps-3.2.8/proc/sysinfo.c 2010-10-12 22:26:26.287879490 -0500
|
|
+++ procps-3.2.8.linux_version_init/proc/sysinfo.c 2010-10-12 23:20:05.617867978 -0500
|
|
@@ -212,6 +212,7 @@
|
|
static void init_libproc(void) __attribute__((constructor));
|
|
static void init_libproc(void){
|
|
have_privs = check_for_privs();
|
|
+ init_Linux_version(); // make sure we have version before continuing...
|
|
// ought to count CPUs in /proc/stat instead of relying
|
|
// on glibc, which foolishly tries to parse /proc/cpuinfo
|
|
//
|
|
diff -ruN procps-3.2.8/proc/version.c procps-3.2.8.linux_version_init/proc/version.c
|
|
--- procps-3.2.8/proc/version.c 2003-01-28 19:11:43.000000000 -0600
|
|
+++ procps-3.2.8.linux_version_init/proc/version.c 2010-10-12 23:21:36.997866602 -0500
|
|
@@ -33,8 +33,9 @@
|
|
|
|
int linux_version_code;
|
|
|
|
-static void init_Linux_version(void) __attribute__((constructor));
|
|
-static void init_Linux_version(void) {
|
|
+// cannot depend on this auto-running before libproc init...
|
|
+//static void init_Linux_version(void) __attribute__((constructor));
|
|
+void init_Linux_version(void){
|
|
static struct utsname uts;
|
|
int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
|
|
|
|
diff -ruN procps-3.2.8/proc/version.h procps-3.2.8.linux_version_init/proc/version.h
|
|
--- procps-3.2.8/proc/version.h 2002-12-14 18:08:32.000000000 -0600
|
|
+++ procps-3.2.8.linux_version_init/proc/version.h 2010-10-12 23:22:06.917867356 -0500
|
|
@@ -14,6 +14,7 @@
|
|
|
|
EXTERN_C_BEGIN
|
|
|
|
+extern void init_Linux_version(void); /* initialize linux version */
|
|
extern void display_version(void); /* display suite version */
|
|
extern const char procps_version[]; /* global buf for suite version */
|
|
|