Messages in this thread Patch in this message | | | Date | Mon, 14 Apr 2008 08:09:41 -0700 (PDT) | From | Linus Torvalds <> | Subject | Re: Shutdown and Reboot Regression 2.6.25-rc[78] |
| |
On Mon, 14 Apr 2008, Linus Torvalds wrote: > > Since you cannot see this on -rc9, can you go back to -rc8 and test this > patch [...]
Oh, maybe I should actually include the patch too ;)
Linus --- kernel/printk.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kernel/printk.c b/kernel/printk.c index c46a20a..4476879 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -643,8 +643,20 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu) { int retval = 0; - if (can_use_console(cpu)) - retval = !try_acquire_console_sem(); + if (!try_acquire_console_sem()) { + retval = 1; + + /* + * If we can't use the console, we need to release + * the console semaphore by hand to avoid flushing + * the buffer + */ + if (!can_use_console(cpu)) { + console_locked = 0; + up(&console_sem); + retval = 0; + } + } printk_cpu = UINT_MAX; spin_unlock(&logbuf_lock); return retval;
| |