diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:37:44 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:37:44 -0500 |
| commit | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (patch) | |
| tree | aaf5ef8c6cd11764d222df9c446ad9af17e0020e /fs/compat.c | |
| parent | 23da0c20ef1c1f0432f373e0e2233a6b6ab2678f (diff) | |
| parent | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c index a719e158e002..8e71cdbecc7c 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1490,7 +1490,6 @@ int compat_do_execve(char * filename, | |||
| 1490 | /* execve success */ | 1490 | /* execve success */ |
| 1491 | security_bprm_free(bprm); | 1491 | security_bprm_free(bprm); |
| 1492 | acct_update_integrals(current); | 1492 | acct_update_integrals(current); |
| 1493 | update_mem_hiwater(current); | ||
| 1494 | kfree(bprm); | 1493 | kfree(bprm); |
| 1495 | return retval; | 1494 | return retval; |
| 1496 | } | 1495 | } |