aboutsummaryrefslogtreecommitdiff
path: root/arch/linux/common/devmemory.h
diff options
context:
space:
mode:
authorAgney Lopes Roth Ferraz <agney@debian.org>2007-09-11 14:53:15 -0300
committerSimon Quigley <tsimonq2@ubuntu.com>2017-06-19 14:38:43 -0500
commit99a9c2a16af89bceed1f90c58faefd555a3268c3 (patch)
tree1e92d5f8160b4445b2459044400120e430f1fc23 /arch/linux/common/devmemory.h
parent0afab9fd83ec42e082ffa61f037519f3e1262e39 (diff)
parent7aeb5ac87c6105bd8fcc9b1fd12e37ba1550f587 (diff)
Import Debian changes 0.4.2.2-1
hardinfo (0.4.2.2-1) unstable; urgency=low * New upstream release. * hardinfo now suggests mesa-utils (Closes: #435793)
Diffstat (limited to 'arch/linux/common/devmemory.h')
-rw-r--r--arch/linux/common/devmemory.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/linux/common/devmemory.h b/arch/linux/common/devmemory.h
index 780ab12f..5eafe599 100644
--- a/arch/linux/common/devmemory.h
+++ b/arch/linux/common/devmemory.h
@@ -27,8 +27,9 @@ static void __scan_memory()
if (offset == -1) {
/* gah. linux 2.4 adds three lines of data we don't need in
/proc/meminfo */
- offset = strstr(idle_free(module_call_method("computer::getOSKernel")),
- "Linux 2.4") ? 3 : 0;
+ gchar *os_kernel = module_call_method("computer::getOSKernel");
+ offset = strstr(os_kernel, "Linux 2.4") ? 3 : 0;
+ g_free(os_kernel);
}
g_file_get_contents("/proc/meminfo", &meminfo, NULL, NULL);