Home » Mailing list archives » linux-kernel » 2008 » February » 21

[PATCH 02/11] slabinfo: fall back from /sys/kernel/slab to /sys/slab

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg Kroah-Hartman <gregkh@...>
To: <linux-kernel@...>
Cc: Christoph Lameter <clameter@...>, Andrew Morton <akpm@...>, Greg Kroah-Hartman <gregkh@...>
Subject: [PATCH 02/11] slabinfo: fall back from /sys/kernel/slab to /sys/slab
Date: Thursday, February 21, 2008 - 7:47 pm

From: Christoph Lameter <clameter@sgi.com>

I keep running upstream and mm kernels and the location of the slab
directory is different since upstream still uses /sys/slab.  This patch
makes slabinfo check /sys/slab if /sys/kernel/slab is not there.  Makes
slabinfo work on any kernel.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 Documentation/vm/slabinfo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c
index 7123fee..22d7e3e 100644
--- a/Documentation/vm/slabinfo.c
+++ b/Documentation/vm/slabinfo.c
@@ -1123,7 +1123,7 @@ void read_slab_dir(void)
 	char *t;
 	int count;
 
-	if (chdir("/sys/kernel/slab"))
+	if (chdir("/sys/kernel/slab") && chdir("/sys/slab"))
 		fatal("SYSFS support for SLUB not active\n");
 
 	dir = opendir(".");
-- 
1.5.4

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[GIT PATCH] driver core fixes against 2.6.25-rc2 git, Greg KH, (Thu Feb 21, 7:46 pm)
Re: [GIT PATCH] driver core fixes against 2.6.25-rc2 git, Sam Ravnborg, (Fri Feb 22, 3:56 am)
Re: [GIT PATCH] driver core fixes against 2.6.25-rc2 git, Greg KH, (Fri Feb 22, 3:56 pm)
Re: [GIT PATCH] driver core fixes against 2.6.25-rc2 git, Sam Ravnborg, (Fri Feb 22, 4:07 pm)
[PATCH 11/11] modules: do not try to add sysfs attributes if..., Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 10/11] POWERPC: fix typo in pseries/power.c, Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 09/11] PM: Remove unbalanced mutex_unlock() from dpm_..., Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 08/11] UIO: fix Greg's stupid changes, Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 07/11] stable_kernel_rules: fix must already be in ma..., Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 06/11] ide: mark "ide=reverse" option as obsolete, Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 05/11] Driver core: Fix error handling in bus_add_dri..., Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 04/11] driver-core: fix kernel-doc function parameters, Greg Kroah-Hartman, (Thu Feb 21, 7:48 pm)
[PATCH 03/11] cpufreq: fix kobject reference count handling, Greg Kroah-Hartman, (Thu Feb 21, 7:47 pm)
Re: [PATCH 03/11] cpufreq: fix kobject reference count handl..., Dave Jones, (Thu Feb 21, 7:53 pm)
[PATCH 02/11] slabinfo: fall back from /sys/kernel/slab to /..., Greg Kroah-Hartman, (Thu Feb 21, 7:47 pm)
[PATCH 01/11] Fix broken utf-8 encodings in ja_JP translatio..., Greg Kroah-Hartman, (Thu Feb 21, 7:47 pm)