sysctl-add-support-for-poll-fix

s/declare/define/ for definitions

Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Greg KH <gregkh@suse.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Signed-off-by: Andrew Morton <>

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index b6820cc49424139c28bc2a3d7531a5474898fc7c..3ec5b780da32db3f0085e2a05d49d12d2ad6cd64 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1029,7 +1029,7 @@ void proc_sys_poll_notify(struct ctl_table_poll *poll);
        .event = ATOMIC_INIT(0),                                        \
        .wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait) }
 
-#define DECLARE_CTL_TABLE_POLL(name)                                   \
+#define DEFINE_CTL_TABLE_POLL(name)                                    \
        struct ctl_table_poll name = __CTL_TABLE_POLL_INITIALIZER(name)
 
 /* A sysctl table is an array of struct ctl_table: */

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index 79603f6d52bd7bc862413676e797f733efc8cfe4..63da38c2d820920b270cc2f469b965e445fecc05 100644 (file)
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -62,8 +62,8 @@ static int proc_do_uts_string(ctl_table *table, int write,
 #define proc_do_uts_string NULL
 #endif
 
-static DECLARE_CTL_TABLE_POLL(hostname_poll);
-static DECLARE_CTL_TABLE_POLL(domainname_poll);
+static DEFINE_CTL_TABLE_POLL(hostname_poll);
+static DEFINE_CTL_TABLE_POLL(domainname_poll);
 
 static struct ctl_table uts_kern_table[] = {
        {