From: Randy Dunlap <randy.dunlap@oracle.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: akpm <akpm@linux-foundation.org>
Subject: [PATCH -next] sysctl: fix build when SYSCTL=y, SYSCTL_SYSCALL=n
Date: Fri, 18 Jul 2008 17:26:30 -0700 [thread overview]
Message-ID: <20080718172630.a0b385e9.randy.dunlap@oracle.com> (raw)
From: Randy Dunlap <randy.dunlap@oracle.com>
The stub needs to be provided when CONFIG_SYSCTL=n, not when
CONFIG_SYSCTL_SYSCALL=n.
linux-next-20080718/kernel/sysctl.c:2970: error: redefinition of 'setup_sysctl_set'
linux-next-20080718/kernel/sysctl.c:1963: error: previous definition of 'setup_sysctl_set' was here
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
kernel/sysctl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- linux-next-20080718.orig/kernel/sysctl.c
+++ linux-next-20080718/kernel/sysctl.c
@@ -1982,6 +1982,12 @@ void unregister_sysctl_table(struct ctl_
{
}
+void setup_sysctl_set(struct ctl_table_set *p,
+ struct ctl_table_set *parent,
+ int (*is_seen)(struct ctl_table_set *))
+{
+}
+
#endif /* CONFIG_SYSCTL */
/*
@@ -2964,12 +2970,6 @@ int sysctl_ms_jiffies(struct ctl_table *
return -ENOSYS;
}
-void setup_sysctl_set(struct ctl_table_set *p,
- struct ctl_table_set *parent,
- int (*is_seen)(struct ctl_table_set *))
-{
-}
-
#endif /* CONFIG_SYSCTL_SYSCALL */
static int deprecated_sysctl_warning(struct __sysctl_args *args)
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
reply other threads:[~2008-07-19 0:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080718172630.a0b385e9.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=akpm@linux-foundation.org \
--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
all inboxes | Powered by JetHome®