From a1e4404b942014f4f73329c9569a4c89602279d9 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 28 Sep 2011 10:51:03 +1000 Subject: [PATCH] sysctl-add-support-for-poll-fix s/declare/define/ for definitions Cc: "Eric W. Biederman" Cc: Al Viro Cc: Alexey Dobriyan Cc: Greg KH Cc: Kay Sievers Cc: Lucas De Marchi Signed-off-by: Andrew Morton <> --- include/linux/sysctl.h | 2 +- kernel/utsname_sysctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index b6820cc49424..3ec5b780da32 100644 --- 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 79603f6d52bd..63da38c2d820 100644 --- 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[] = { { -- 2.39.5