Message ID | CALdTtnuMV0znaCEDPBLXohC234OvPzSjwpn-hSenA6WgMWD5eQ@mail.gmail.com |
---|---|
State | New |
Headers | show |
On Wed, Aug 06, 2014 at 06:37:41AM -0600, Dann Frazier wrote: > Thanks Joseph. I've verified that this is *not* an issue in the > upstream branch. This appears to be a bad interaction between this fix > and the aufs patches in Ubuntu. > > Smallest fix appears to be as follows, though 8646cbac from utopic > looks like it might be a proper (though more involved) solution. > Yeah, this seems to be correct: commit c9c5b652e3d8 ("UBUNTU: ubuntu: aufs3 -- (no-up) aufs3-mmap.patch") introduced some changes into linux/mm.h that don't play nicely with the commit c3208d7fd18a ("ptrace: fix fork event messages across pid namespaces"). Your patch seems to be an acceptable SAUCE patch to fix this build failure. Cheers, -- Luís > diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h > index cc79eff..8314249 100644 > --- a/include/linux/ptrace.h > +++ b/include/linux/ptrace.h > @@ -5,9 +5,10 @@ > #include <linux/sched.h> /* For struct task_struct. */ > #include <linux/err.h> /* for IS_ERR_VALUE */ > #include <linux/bug.h> /* For BUG_ON. */ > -#include <linux/pid_namespace.h> /* For task_active_pid_ns. */ > #include <uapi/linux/ptrace.h> > > +extern struct pid_namespace *task_active_pid_ns(struct task_struct *tsk); > + > /* > * Ptrace flags > * > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index cc79eff..8314249 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -5,9 +5,10 @@ #include <linux/sched.h> /* For struct task_struct. */ #include <linux/err.h> /* for IS_ERR_VALUE */ #include <linux/bug.h> /* For BUG_ON. */ -#include <linux/pid_namespace.h> /* For task_active_pid_ns. */ #include <uapi/linux/ptrace.h> +extern struct pid_namespace *task_active_pid_ns(struct task_struct *tsk); + /* * Ptrace flags *