diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
| commit | f0612bbc41f65f5a684f69d714a1a17a6f0f40c5 (patch) | |
| tree | 8c070070bb355843cfa4635643e9da7c2c4cd44a /fs/compat.c | |
| parent | b0c4e148bd591629749d02a8fbc8d81c26d548cf (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
Merge branch 'upstream'
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 | } |