Hi Jiri,
Today's linux-next merge of the limits tree got a conflict in fs/exec.c
between commit f6151dfea21496d43dbaba32cfcd9c9f404769bc ("mm: introduce
coredump parameter structure") from the tree and commit
1157605c47673fc63b052df4688697695a9873d5 ("FS: use helpers for rlimits")
from the limits tree.
I fixed it up (see below - thanks Andrew) and can carry the fix for a
while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc fs/exec.c
index ac52447,8a160a1..0000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1772,11 -1763,6 +1772,11 @@@ void do_coredump(long signr, int exit_c
int helper_argc = 0;
int dump_count = 0;
static atomic_t core_dump_count = ATOMIC_INIT(0);
+ struct coredump_params cprm = {
+ .signr = signr,
+ .regs = regs,
- .limit = current->signal->rlim[RLIMIT_CORE].rlim_cur,
++ .limit = rlimit(RLIMIT_CORE),
+ };
audit_core_dumps(signr);
Attachment:
pgp3qGEHcI7we.pgp
Description: PGP signature
