diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-12 13:21:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-12 13:21:06 +1000 |
| commit | 18974106fa59bdd5778f53d86681a728c202054c (patch) | |
| tree | 7ec167309948e464fd08b99d8326410183eef2ca /fs | |
| parent | 1c57af53b757e37f9b5b22f119650629fa5d0fbb (diff) | |
| parent | d31bf8595853e779b7121cb9d0e86a8d0544ca79 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 1 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c index 65145a3df065..72934df68471 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1320,6 +1320,7 @@ void setup_new_exec(struct linux_binprm * bprm) else set_dumpable(current->mm, suid_dumpable); + arch_setup_new_exec(); perf_event_exec(); __set_task_comm(current, kbasename(bprm->filename), true); diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 04cafaa94bf7..2be32955d7f2 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1020,7 +1020,7 @@ out_nfserr: else err = nfserrno(host_err); if (test_bit(RQ_LOCAL, &rqstp->rq_flags)) - tsk_restore_flags(current, pflags, PF_LESS_THROTTLE); + current_restore_flags(pflags, PF_LESS_THROTTLE); return err; } |