Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277189
b: refs/heads/master
c: 1a9a8ae
h: refs/heads/master
i:
  277187: 0913041
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Nov 14, 2011
1 parent f449ddd commit 3ae4f15
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 47ff5c95db598184122aa634fa3452c0eecea877
refs/heads/master: 1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1
4 changes: 2 additions & 2 deletions trunk/kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
printk_delay();

/* This stops the holder of console_sem just where we want him */
raw_local_irq_save(flags);
local_irq_save(flags);
this_cpu = smp_processor_id();

/*
Expand Down Expand Up @@ -962,7 +962,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)

lockdep_on();
out_restore_irqs:
raw_local_irq_restore(flags);
local_irq_restore(flags);

return printed_len;
}
Expand Down

0 comments on commit 3ae4f15

Please sign in to comment.