From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Christoph Lameter <clameter@sgi.com>,
Andrew Morton <akpm@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 02/11] slabinfo: fall back from /sys/kernel/slab to /sys/slab
Date: Thu, 21 Feb 2008 15:47:58 -0800 [thread overview]
Message-ID: <1203637687-7273-2-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20080221234649.GB7128@kroah.com>
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
next prev parent reply other threads:[~2008-02-21 23:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-21 23:46 [GIT PATCH] driver core fixes against 2.6.25-rc2 git Greg KH
2008-02-21 23:47 ` [PATCH 01/11] Fix broken utf-8 encodings in ja_JP translation of stable_kernel_rules.txt Greg Kroah-Hartman
2008-02-21 23:47 ` Greg Kroah-Hartman [this message]
2008-02-21 23:47 ` [PATCH 03/11] cpufreq: fix kobject reference count handling Greg Kroah-Hartman
2008-02-21 23:53 ` Dave Jones
2008-02-21 23:48 ` [PATCH 04/11] driver-core: fix kernel-doc function parameters Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 05/11] Driver core: Fix error handling in bus_add_driver() Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 06/11] ide: mark "ide=reverse" option as obsolete Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 07/11] stable_kernel_rules: fix must already be in mainline Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 08/11] UIO: fix Greg's stupid changes Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 09/11] PM: Remove unbalanced mutex_unlock() from dpm_resume() Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 10/11] POWERPC: fix typo in pseries/power.c Greg Kroah-Hartman
2008-02-21 23:48 ` [PATCH 11/11] modules: do not try to add sysfs attributes if !CONFIG_SYSFS Greg Kroah-Hartman
2008-02-22 7:56 ` [GIT PATCH] driver core fixes against 2.6.25-rc2 git Sam Ravnborg
2008-02-22 19:56 ` Greg KH
2008-02-22 20:07 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1203637687-7273-2-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=clameter@sgi.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome