Skip to content

Commit

Permalink
printk, lockdep: Switch to tracked irq ops
Browse files Browse the repository at this point in the history
Switch to local_irq_ ops so that the irq state is properly tracked
(raw_local_irq_* isn't tracked by lockdep, causing confusion).

Possible now that commit dd4e5d3 ("lockdep: Fix
trace_[soft,hard]irqs_[on,off]() recursion") cured the reason we
needed the raw_ ops.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Nov 14, 2011
1 parent 47ff5c9 commit 1a9a8ae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 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 1a9a8ae

Please sign in to comment.