From: Joe Millenbach <jmillenbach@gmail.com>
To: "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
x86@kernel.org, Gokul Caushik <caushik1@gmail.com>,
Josh Triplett <josh@joshtriplett.org>,
Joe Millenbach <jmillenbach@gmail.com>,
Jesper Juhl <jj@chaosbits.net>,
linux-kernel@vger.kernel.org
Cc: team-fjord@googlegroups.com
Subject: [PATCH 2/7] x86/boot: Wrap debug printing in a new debug_putstr function
Date: Thu, 19 Jul 2012 18:04:37 -0700 [thread overview]
Message-ID: <1342746282-28497-3-git-send-email-jmillenbach@gmail.com> (raw)
In-Reply-To: <1342746282-28497-1-git-send-email-jmillenbach@gmail.com>
Change all instances of if (debug) putstr(...) to a new debug_putstr(...).
This allows a future change to conditionally stub out debug_putstr to save
space.
Signed-off-by: Joe Millenbach <jmillenbach@gmail.com>
Signed-off-by: Gokul Caushik <caushik1@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
arch/x86/boot/compressed/misc.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 8f2355d..49c6d56 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -223,6 +223,12 @@ void __putstr(int error, const char *s)
outb(0xff & (pos >> 1), vidport+1);
}
+static void debug_putstr(const char *s)
+{
+ if (debug)
+ putstr(s);
+}
+
void *memset(void *s, int c, size_t n)
{
int i;
@@ -293,8 +299,7 @@ static void parse_elf(void *output)
return;
}
- if (debug)
- putstr("Parsing ELF... ");
+ debug_putstr("Parsing ELF... ");
phdrs = malloc(sizeof(*phdrs) * ehdr.e_phnum);
if (!phdrs)
@@ -346,8 +351,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
cols = real_mode->screen_info.orig_video_cols;
console_init();
- if (debug)
- putstr("early console in decompress_kernel\n");
+ debug_putstr("early console in decompress_kernel\n");
free_mem_ptr = heap; /* Heap */
free_mem_end_ptr = heap + BOOT_HEAP_SIZE;
@@ -366,11 +370,9 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
error("Wrong destination address");
#endif
- if (debug)
- putstr("\nDecompressing Linux... ");
+ debug_putstr("\nDecompressing Linux... ");
decompress(input_data, input_len, NULL, NULL, output, NULL, error);
parse_elf(output);
- if (debug)
- putstr("done.\nBooting the kernel.\n");
+ debug_putstr("done.\nBooting the kernel.\n");
return;
}
--
1.7.9.5
next prev parent reply other threads:[~2012-07-20 1:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1342746282-28497-1-git-send-email-jmillenbach@gmail.com>
2012-07-20 1:04 ` [PATCH 1/7] x86/boot: Removed quiet flag and switched quiet output to debug flag Joe Millenbach
2012-07-22 0:53 ` [tip:x86/boot] x86, boot: " tip-bot for Joe Millenbach
2012-07-20 1:04 ` Joe Millenbach [this message]
2012-07-22 0:54 ` [tip:x86/boot] x86, boot: Wrap debug printing in a new debug_putstr function tip-bot for Joe Millenbach
2012-07-20 1:04 ` [PATCH 3/7] x86/boot: Changed error putstr path to match new debug_putstr format Joe Millenbach
2012-07-22 0:55 ` [tip:x86/boot] x86, boot: " tip-bot for Joe Millenbach
2012-07-20 1:04 ` [PATCH 4/7] x86/boot: Switch output functions from command-line flags to conditional compilation Joe Millenbach
2012-07-22 0:56 ` [tip:x86/boot] x86, boot: " tip-bot for Joe Millenbach
2012-07-20 1:04 ` [PATCH 5/7] x86/boot: Removed unused debug flag and set code Joe Millenbach
2012-07-22 0:57 ` [tip:x86/boot] x86, boot: " tip-bot for Joe Millenbach
2012-07-20 1:04 ` [PATCH 6/7] x86/boot: Exclude early_serial_console.c if can't use it Joe Millenbach
2012-07-22 0:58 ` [tip:x86/boot] x86, boot: Exclude early_serial_console.c if can' t " tip-bot for Joe Millenbach
2012-07-20 1:04 ` [PATCH 7/7] x86/boot: Exclude cmdline.c if you can't " Joe Millenbach
2012-07-22 0:59 ` [tip:x86/boot] x86, boot: " tip-bot for Gokul Caushik
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=1342746282-28497-3-git-send-email-jmillenbach@gmail.com \
--to=jmillenbach@gmail.com \
--cc=caushik1@gmail.com \
--cc=hpa@zytor.com \
--cc=jj@chaosbits.net \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=team-fjord@googlegroups.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).