Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33233
b: refs/heads/master
c: 78944e5
h: refs/heads/master
i:
  33231: 697604d
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Aug 6, 2006
1 parent 8c6553e commit e0347a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 38cbcdc0a7be69a15462dc49512d43353f34b43b
refs/heads/master: 78944e549d36673eb6265a2411574e79c28e23dc
4 changes: 3 additions & 1 deletion trunk/kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,9 @@ void release_console_sem(void)
up(&secondary_console_sem);
return;
}

console_may_schedule = 0;

for ( ; ; ) {
spin_lock_irqsave(&logbuf_lock, flags);
wake_klogd |= log_start - log_end;
Expand All @@ -812,7 +815,6 @@ void release_console_sem(void)
local_irq_restore(flags);
}
console_locked = 0;
console_may_schedule = 0;
up(&console_sem);
spin_unlock_irqrestore(&logbuf_lock, flags);
if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait)) {
Expand Down

0 comments on commit e0347a4

Please sign in to comment.