diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 04:06:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 04:06:54 +0400 |
| commit | 78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c (patch) | |
| tree | 8e3fce9f27fd058904c0a3247a5c5ebb8df9fbe8 /fs/exec.c | |
| parent | cd816a0d84377c4e87f55cbe934a23417f9f5743 (diff) | |
| parent | 5f202bd5ca64132cdd7f186656bc0221f257733d (diff) | |
| download | linux-78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c.tar.xz | |
Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
do_coredump: Do not take BKL
init: Remove the BKL from startup code
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/exec.c b/fs/exec.c index 97d91a03fb13..dab85ecad686 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -28,7 +28,6 @@ #include <linux/mm.h> #include <linux/stat.h> #include <linux/fcntl.h> -#include <linux/smp_lock.h> #include <linux/swap.h> #include <linux/string.h> #include <linux/init.h> @@ -1892,13 +1891,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) */ clear_thread_flag(TIF_SIGPENDING); - /* - * lock_kernel() because format_corename() is controlled by sysctl, which - * uses lock_kernel() - */ - lock_kernel(); ispipe = format_corename(corename, signr); - unlock_kernel(); if (ispipe) { int dump_count; |