diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-31 15:55:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-31 15:55:05 -0800 |
| commit | 1347e965f5bcfffe82e56d2903ea4f32babaff4e (patch) | |
| tree | 51f75d125089a25feb12b9e2e1e5273a59836e32 /kernel/signal.c | |
| parent | ac56b94f8049b4c246cd86257ae6c03c0ac75a13 (diff) | |
| parent | d7240b988017521ebf89edfadd42c0942f166850 (diff) | |
| download | linux-1347e965f5bcfffe82e56d2903ea4f32babaff4e.tar.bz2 | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
generic-ipi: use per cpu data for single cpu ipi calls
cpumask: convert lib/smp_processor_id to new cpumask ops
signals, debug: fix BUG: using smp_processor_id() in preemptible code in print_fatal_signal()
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index e73759783dc8..b6b36768b758 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -909,7 +909,9 @@ static void print_fatal_signal(struct pt_regs *regs, int signr) } #endif printk("\n"); + preempt_disable(); show_regs(regs); + preempt_enable(); } static int __init setup_print_fatal_signals(char *str) |