[PATCH next] sysctl: fix build breakage

[PATCH next] sysctl: fix build breakage

[Alexander Beregalov]

Fix this build error when MODULES is not set:
kernel/sysctl.c:545: error: 'one' undeclared here

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

 kernel/sysctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4a0f8ad..655762b 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -91,7 +91,7 @@ extern int rcutorture_runnable;
 #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
 
 /* Constants used for minimum and  maximum */
-#if defined(CONFIG_DETECT_HUNG_TASK) || defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
+#if defined(CONFIG_DETECT_HUNG_TASK) || defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) || defined(CONFIG_MODULES)
 static int one = 1;
 #endif
 #ifdef CONFIG_DETECT_SOFTLOCKUP

Re: [PATCH next] sysctl: fix build breakage

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Hi Alexander,

On Mon, 6 Apr 2009 11:01:52 +0400 Alexander Beregalov <a.beregalov@gmail.com> wrote:
>
> Fix this build error when MODULES is not set:
> kernel/sysctl.c:545: error: 'one' undeclared here

Thanks for this.

This is a result of the automated merge of the security-testing tree into
the linux-next tree getting it wrong (but it is unreasonable to expect it
to get it right).  I will fix this up tomorrow if it is still necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH next] sysctl: fix build breakage

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 706 bytes --]

On Mon, 6 Apr 2009 17:11:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 6 Apr 2009 11:01:52 +0400 Alexander Beregalov <a.beregalov@gmail.com> wrote:
> >
> > Fix this build error when MODULES is not set:
> > kernel/sysctl.c:545: error: 'one' undeclared here
> 
> Thanks for this.
> 
> This is a result of the automated merge of the security-testing tree into
> the linux-next tree getting it wrong (but it is unreasonable to expect it
> to get it right).  I will fix this up tomorrow if it is still necessary.

One of the changes that caused this has been removed.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]