diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-02 23:02:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-02 23:02:10 -0400 |
| commit | 954f9ac43b87b44152b8c21163cefd466a87145e (patch) | |
| tree | 31c4197f975c66c96976948663e6ce844900b41a /kernel/exit.c | |
| parent | 1b62ca7bf5775bed048032b7e779561e1fe66aa0 (diff) | |
| parent | 7fe0b14b725d6d09a1d9e1409bd465cb88b587f9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
There's a Niagara 2 memcpy fix in this tree and I have
a Kconfig fix from Dave Jones which requires the sparc-next
changes which went upstream yesterday.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index f65345f9e5bb..42f25952edd9 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -1046,6 +1046,9 @@ void do_exit(long code) | |||
| 1046 | if (tsk->splice_pipe) | 1046 | if (tsk->splice_pipe) |
| 1047 | __free_pipe_info(tsk->splice_pipe); | 1047 | __free_pipe_info(tsk->splice_pipe); |
| 1048 | 1048 | ||
| 1049 | if (tsk->task_frag.page) | ||
| 1050 | put_page(tsk->task_frag.page); | ||
| 1051 | |||
| 1049 | validate_creds_for_do_exit(tsk); | 1052 | validate_creds_for_do_exit(tsk); |
| 1050 | 1053 | ||
| 1051 | preempt_disable(); | 1054 | preempt_disable(); |
