From: Ingo Molnar <mingo@elte.hu>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kevin Winchester <kjwinchester@gmail.com>
Subject: [git pull] printk fix (was: Re: X fails to start with latest Linus git)
Date: Sun, 27 Jan 2008 08:12:40 +0100 [thread overview]
Message-ID: <20080127071240.GA31946@elte.hu> (raw)
In-Reply-To: <479BCE03.6070603@gmail.com>
Linus,
please pull the following printk fix:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git
it reverts 19ef9309273d: Kevin Winchester reported a
CONFIG_PRINTK_TIME=y related hang during X startup, and biscted it down
to this commit.
Ingo
------------------>
Ingo Molnar (1):
printk: revert ktime_get() timestamps
printk.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/printk.c b/kernel/printk.c
index 423a8c7..3b7c968 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -702,9 +702,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
loglev_char = default_message_loglevel
+ '0';
}
- t = 0;
- if (system_state != SYSTEM_BOOTING)
- t = ktime_to_ns(ktime_get());
+ t = cpu_clock(printk_cpu);
nanosec_rem = do_div(t, 1000000000);
tlen = sprintf(tbuf,
"<%c>[%5lu.%06lu] ",
prev parent reply other threads:[~2008-01-27 7:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-27 0:19 X fails to start with latest Linus git Kevin Winchester
2008-01-27 0:35 ` Kevin Winchester
2008-01-27 6:27 ` Ingo Molnar
2008-01-27 10:42 ` Jan Engelhardt
2008-01-27 12:31 ` Kevin Winchester
2008-01-27 12:35 ` Ingo Molnar
2008-01-27 23:08 ` Kevin Winchester
2008-01-27 12:37 ` Ingo Molnar
2008-01-27 12:41 ` Ingo Molnar
2008-01-27 12:42 ` Ingo Molnar
2008-01-27 23:12 ` Kevin Winchester
2008-01-27 23:35 ` Kevin Winchester
2008-01-27 23:10 ` Kevin Winchester
2008-01-27 7:12 ` Ingo Molnar [this message]
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=20080127071240.GA31946@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=kjwinchester@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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