From: tip-bot for Joe Millenbach <jmillenbach@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
caushik1@gmail.com, jmillenbach@gmail.com, josh@joshtriplett.org,
tglx@linutronix.de
Subject: [tip:x86/boot] x86, boot: Changed error putstr path to match new debug_putstr format
Date: Sat, 21 Jul 2012 17:55:42 -0700 [thread overview]
Message-ID: <tip-cb454fe10400566214ec690318a0167ff7f5b8ca@git.kernel.org> (raw)
In-Reply-To: <1342746282-28497-4-git-send-email-jmillenbach@gmail.com>
Commit-ID: cb454fe10400566214ec690318a0167ff7f5b8ca
Gitweb: http://git.kernel.org/tip/cb454fe10400566214ec690318a0167ff7f5b8ca
Author: Joe Millenbach <jmillenbach@gmail.com>
AuthorDate: Thu, 19 Jul 2012 18:04:38 -0700
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Sat, 21 Jul 2012 11:07:22 -0700
x86, boot: Changed error putstr path to match new debug_putstr format
For consistency we changed the error output path to match the new debug path.
Signed-off-by: Joe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1342746282-28497-4-git-send-email-jmillenbach@gmail.com
Signed-off-by: Gokul Caushik <caushik1@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/boot/compressed/misc.c | 6 +++---
arch/x86/boot/compressed/misc.h | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 49c6d56..de1d54d 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -270,9 +270,9 @@ void *memcpy(void *dest, const void *src, size_t n)
static void error(char *x)
{
- __putstr(1, "\n\n");
- __putstr(1, x);
- __putstr(1, "\n\n -- System halted");
+ error_putstr("\n\n");
+ error_putstr(x);
+ error_putstr("\n\n -- System halted");
while (1)
asm("hlt");
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index 3f19c81..4c1bfb6 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -26,6 +26,7 @@
extern struct boot_params *real_mode; /* Pointer to real-mode data */
void __putstr(int error, const char *s);
#define putstr(__x) __putstr(0, __x)
+#define error_putstr(__x) __putstr(1, __x)
#define puts(__x) __putstr(0, __x)
/* cmdline.c */
next prev parent reply other threads:[~2012-07-22 0:55 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 ` [PATCH 2/7] x86/boot: Wrap debug printing in a new debug_putstr function Joe Millenbach
2012-07-22 0:54 ` [tip:x86/boot] x86, boot: " 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-bot for Joe Millenbach [this message]
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=tip-cb454fe10400566214ec690318a0167ff7f5b8ca@git.kernel.org \
--to=jmillenbach@gmail.com \
--cc=caushik1@gmail.com \
--cc=hpa@zytor.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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).