diff options
| author |   Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 09:01:22 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 09:01:22 +0000 |
| commit | f621c5334396fd153cd882ea92466823b7e7b821 (patch) | |
| tree | 7b829cad44dc0e5003d7cacac3a7a1b128637083 /kernel | |
| parent | Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux (diff) | |
| parent | Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (diff) | |
| download | linux-dev-f621c5334396fd153cd882ea92466823b7e7b821.tar.xz linux-dev-f621c5334396fd153cd882ea92466823b7e7b821.zip | |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index b77fd559c78e..e2cd3e2a5ae8 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -66,6 +66,7 @@ #include <linux/user-return-notifier.h> #include <linux/oom.h> #include <linux/khugepaged.h> +#include <linux/signalfd.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> @@ -935,8 +936,10 @@ static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk) void __cleanup_sighand(struct sighand_struct *sighand) { - if (atomic_dec_and_test(&sighand->count)) + if (atomic_dec_and_test(&sighand->count)) { + signalfd_cleanup(sighand); kmem_cache_free(sighand_cachep, sighand); + } } |