2010-11-16 05:17:31

by Joe Perches

Subject: [PATCH] kernel/sysctl.c: Fix build failure with !CONFIG_PRINTK

Sigh...

Signed-off-by: Joe Perches <[email protected]>
---
kernel/sysctl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index b65bf63..5abfa15 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -702,7 +702,6 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &ten_thousand,
},
-#endif
{
.procname = "dmesg_restrict",
.data = &dmesg_restrict,
@@ -712,6 +711,7 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
+#endif
{
.procname = "ngroups_max",
.data = &ngroups_max,

2010-11-16 05:36:36

by Eric Paris

Subject: Re: [PATCH] kernel/sysctl.c: Fix build failure with !CONFIG_PRINTK

On Mon, 2010-11-15 at 21:17 -0800, Joe Perches wrote:
> Sigh...
>
> Signed-off-by: Joe Perches <[email protected]>

eparis fails again.

Acked-by: Eric Paris <[email protected]>

> ---
> kernel/sysctl.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index b65bf63..5abfa15 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -702,7 +702,6 @@ static struct ctl_table kern_table[] = {
> .extra1 = &zero,
> .extra2 = &ten_thousand,
> },
> -#endif
> {
> .procname = "dmesg_restrict",
> .data = &dmesg_restrict,
> @@ -712,6 +711,7 @@ static struct ctl_table kern_table[] = {
> .extra1 = &zero,
> .extra2 = &one,
> },
> +#endif
> {
> .procname = "ngroups_max",
> .data = &ngroups_max,
>
>

2010-11-16 22:02:17

by James Morris

Subject: Re: [PATCH] kernel/sysctl.c: Fix build failure with !CONFIG_PRINTK

On Tue, 16 Nov 2010, Eric Paris wrote:

> On Mon, 2010-11-15 at 21:17 -0800, Joe Perches wrote:
> > Sigh...
> >
> > Signed-off-by: Joe Perches <[email protected]>
>
> eparis fails again.
>
> Acked-by: Eric Paris <[email protected]>

Acked-by: James Morris <[email protected]>


>
> > ---
> > kernel/sysctl.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> > index b65bf63..5abfa15 100644
> > --- a/kernel/sysctl.c
> > +++ b/kernel/sysctl.c
> > @@ -702,7 +702,6 @@ static struct ctl_table kern_table[] = {
> > .extra1 = &zero,
> > .extra2 = &ten_thousand,
> > },
> > -#endif
> > {
> > .procname = "dmesg_restrict",
> > .data = &dmesg_restrict,
> > @@ -712,6 +711,7 @@ static struct ctl_table kern_table[] = {
> > .extra1 = &zero,
> > .extra2 = &one,
> > },
> > +#endif
> > {
> > .procname = "ngroups_max",
> > .data = &ngroups_max,
> >
> >
>
>

--
James Morris
<[email protected]>