Skip to contentSkip to conversation

sysctl: fix build breakage

PATCH In review Alexander Beregalov 2 participants 3 messages Apr 6, 2009 – Apr 7, 2009

Subsystems (2)
Linux-next tree Proc sysctl
lore
Share & tools
lore

Alexander Beregalov

author
#0 lore raw

PATCH 1/1 sysctl: fix build breakage

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

Signed-off-by Alexander Beregalov <[email protected]>

---

 kernel/sysctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/sysctl.c +1 -1
index 4a0f8ad..655762b 100644
@@ -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
#1 lore raw

Hi Alexander,

Quoted 3 lines · On Mon, 6 Apr 2009 11:01:52 +0400 Alexander Beregalov <[email protected]>…

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.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
Quoted 11 lines · On Mon, 6 Apr 2009 17:11:12 +1000 Stephen Rothwell <[email protected]> wrote:
Quoted 3 lines · On Mon, 6 Apr 2009 11:01:52 +0400 Alexander Beregalov <[email protected]>…

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.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/