diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
| commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
| tree | 7064703c5d63d44700085cd701703457730bc06e /kernel/signal.c | |
| parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 e73759783dc..b6b36768b75 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -909,7 +909,9 @@ static void print_fatal_signal(struct pt_regs *regs, int signr) | |||
| 909 | } | 909 | } |
| 910 | #endif | 910 | #endif |
| 911 | printk("\n"); | 911 | printk("\n"); |
| 912 | preempt_disable(); | ||
| 912 | show_regs(regs); | 913 | show_regs(regs); |
| 914 | preempt_enable(); | ||
| 913 | } | 915 | } |
| 914 | 916 | ||
| 915 | static int __init setup_print_fatal_signals(char *str) | 917 | static int __init setup_print_fatal_signals(char *str) |