public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	Theodore Tso <tytso@mit.edu>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	zippel@linux-m68k.org, linux-kbuild@vger.kernel.org,
	Sam Ravnborg <sam@ravnborg.org>,
	Dick Streefland <dick@streefland.net>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [PATCH 11/15] kconfig: unset IKCONFIG_PROC and clean up nesting
Date: Fri, 11 Sep 2009 15:59:00 -0400	[thread overview]
Message-ID: <20090911200035.536991976@goodmis.org> (raw)
In-Reply-To: 20090911195849.451244684@goodmis.org

[-- Attachment #1: 0011-kconfig-unset-IKCONFIG_PROC-and-clean-up-nesting.patch --]
[-- Type: text/plain, Size: 1196 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

Due to cut and paste error IKCONFIG was both set and cleared.
It was suppose to be IKCONFIG_PROC to be cleared.

Also cleaned up if nesting.

Reported-by: Alan Jenkins <sourcejedi.lkml@googlemail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 9fa3f81..69b7c3f 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -323,7 +323,7 @@ while(<CIN>) {
 	    # enable IKCONFIG at least as a module
 	    print "CONFIG_IKCONFIG=m\n";
 	    # don't ask about PROC
-	    print "# CONFIG_IKCONFIG is not set\n";
+	    print "# CONFIG_IKCONFIG_PROC is not set\n";
 	} else {
 	    print;
 	}
@@ -333,15 +333,12 @@ while(<CIN>) {
     if (/^(CONFIG.*)=(m|y)/) {
 	if (defined($configs{$1})) {
 	    $setconfigs{$1} = $2;
-	    print;
 	} elsif ($2 eq "m") {
 	    print "# $1 is not set\n";
-	} else {
-	    print;
+	    next;
 	}
-    } else {
-	print;
     }
+    print;
 }
 close(CIN);
 
-- 
1.6.3.3

-- 

  parent reply	other threads:[~2009-09-11 20:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-11 19:58 [PATCH 00/15] [GIT PULL] kconfig: localmodconfig for v2.6.32 Steven Rostedt
2009-09-11 19:58 ` [PATCH 01/15] kconfig: add streamline_config.pl to scripts Steven Rostedt
2009-09-11 19:58 ` [PATCH 02/15] kconfig: make localmodconfig to run streamline_config.pl Steven Rostedt
2009-09-11 19:58 ` [PATCH 03/15] kconfig: add make localyesconfig option Steven Rostedt
2009-09-11 19:58 ` [PATCH 04/15] kconfig: streamline_config.pl do not stop with no depends Steven Rostedt
2009-09-11 19:58 ` [PATCH 05/15] kconfig: do not warn about modules built in Steven Rostedt
2009-09-11 19:58 ` [PATCH 06/15] kconfig: enable CONFIG_IKCONFIG from streamline_config.pl Steven Rostedt
2009-09-11 19:58 ` [PATCH 07/15] kconfig: add check if end exists in extract-ikconfig Steven Rostedt
2009-09-11 19:58 ` [PATCH 08/15] kconfig: have extract-ikconfig read ELF files Steven Rostedt
2009-09-11 19:58 ` [PATCH 09/15] kconfig: keep config.gz around even if CONFIG_IKCONFIG_PROC is not set Steven Rostedt
2009-09-11 19:58 ` [PATCH 10/15] kconfig: search for a config to base the local(mod|yes)config on Steven Rostedt
2009-09-11 19:59 ` Steven Rostedt [this message]
2009-09-11 19:59 ` [PATCH 12/15] kconfig: test for /boot/config-uname after /proc/config.gz in localconfig Steven Rostedt
2009-09-11 19:59 ` [PATCH 13/15] kconfig: make local .config default for streamline_config Steven Rostedt
2009-09-11 19:59 ` [PATCH 14/15] kconfig: test if a .config already exists Steven Rostedt
2009-09-11 19:59 ` [PATCH 15/15] kconfig: add missing dependency of conf to localyesconfig Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090911200035.536991976@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=acme@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=dick@streefland.net \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=sam@ravnborg.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=tytso@mit.edu \
    --cc=zippel@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox