From: Tejun Heo <tj@kernel.org>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH wq#for-next] fscache: fix build on !CONFIG_SYSCTL
Date: Sat, 24 Jul 2010 11:14:17 +0200 [thread overview]
Message-ID: <4C4AAEE9.8050903@kernel.org> (raw)
In-Reply-To: <20100723090831.6af4a288.randy.dunlap@oracle.com>
Commit 8b8edefa (fscache: convert object to use workqueue instead of
slow-work) made fscache_exit() call unregister_sysctl_table()
unconditionally breaking build when sysctl is disabled. Fix it by
putting it inside CONFIG_SYSCTL.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: David Howells <dhowells@redhat.com>
---
This should fix it. Thanks.
fs/fscache/main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fs/fscache/main.c b/fs/fscache/main.c
index 500936d..f9d8567 100644
--- a/fs/fscache/main.c
+++ b/fs/fscache/main.c
@@ -186,7 +186,9 @@ static void __exit fscache_exit(void)
kobject_put(fscache_root);
kmem_cache_destroy(fscache_cookie_jar);
+#ifdef CONFIG_SYSCTL
unregister_sysctl_table(fscache_sysctl_header);
+#endif
fscache_proc_cleanup();
destroy_workqueue(fscache_op_wq);
destroy_workqueue(fscache_object_wq);
--
1.7.1
next prev parent reply other threads:[~2010-07-24 9:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 6:49 linux-next: Tree for July 23 Stephen Rothwell
2010-07-23 16:08 ` linux-next: Tree for July 23 (fscache) Randy Dunlap
2010-07-23 18:24 ` Intel sound proke in today;s next Piotr Hosowicz
2010-07-23 18:27 ` Piotr Hosowicz
2010-07-24 1:59 ` Stephen Rothwell
2010-07-25 15:27 ` Takashi Iwai
2010-07-25 15:56 ` Piotr Hosowicz
2010-07-26 7:29 ` Takashi Iwai
2010-07-26 16:57 ` Piotr Hosowicz
2010-07-26 17:24 ` Takashi Iwai
2010-07-26 17:33 ` Piotr Hosowicz
2010-07-26 18:00 ` Takashi Iwai
2010-07-26 18:30 ` Piotr Hosowicz
2010-07-26 19:03 ` Piotr Hosowicz
2010-07-26 20:17 ` Takashi Iwai
2010-07-26 20:54 ` Piotr Hosowicz
2010-07-27 5:41 ` Takashi Iwai
2010-07-24 9:14 ` Tejun Heo [this message]
2010-07-25 22:18 ` [PATCH wq#for-next] fscache: fix build on !CONFIG_SYSCTL Randy Dunlap
2010-07-23 16:41 ` [PATCH -next] compal-laptop: depends on POWER_SUPPLY Randy Dunlap
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=4C4AAEE9.8050903@kernel.org \
--to=tj@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).