diff mbox

[Trusty] UBUNTU: SAUCE: (no-up) Fix build failure on arm64

Message ID 20140806144608.GA24606@fluid.dannf
State New
Headers show

Commit Message

dann frazier Aug. 6, 2014, 2:46 p.m. UTC
commit c3208d7fd18a ("ptrace: fix fork event messages across pid namespaces")
breaks building on arm64 due to a bad interaction (header loop) with
c9c5b652e3d8 ("UBUNTU: ubuntu:aufs3 -- (no-up) aufs3-mmap.patch).

Fix this by avoiding the new include and just adding the needed prototype.

Reference: https://lists.ubuntu.com/archives/kernel-team/2014-August/047024.html
Signed-off-by: dann frazier <dann.frazier@canonical.com>
---
 include/linux/ptrace.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Brad Figg Aug. 6, 2014, 4 p.m. UTC | #1
On 08/06/2014 07:46 AM, dann frazier wrote:
> commit c3208d7fd18a ("ptrace: fix fork event messages across pid namespaces")
> breaks building on arm64 due to a bad interaction (header loop) with
> c9c5b652e3d8 ("UBUNTU: ubuntu:aufs3 -- (no-up) aufs3-mmap.patch).
> 
> Fix this by avoiding the new include and just adding the needed prototype.
> 
> Reference: https://lists.ubuntu.com/archives/kernel-team/2014-August/047024.html
> Signed-off-by: dann frazier <dann.frazier@canonical.com>
> ---
>  include/linux/ptrace.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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
>   *
>
Chris J Arges Aug. 6, 2014, 4:10 p.m. UTC | #2
This patch will work for now to fix build failures; but if we think
c9c5b652e3d8 ultimately causes the issue (I see it includes three
headers); then we should fix that patch eventually.

Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>

On 08/06/2014 09:46 AM, dann frazier wrote:
> commit c3208d7fd18a ("ptrace: fix fork event messages across pid namespaces")
> breaks building on arm64 due to a bad interaction (header loop) with
> c9c5b652e3d8 ("UBUNTU: ubuntu:aufs3 -- (no-up) aufs3-mmap.patch).
> 
> Fix this by avoiding the new include and just adding the needed prototype.
> 
> Reference: https://lists.ubuntu.com/archives/kernel-team/2014-August/047024.html
> Signed-off-by: dann frazier <dann.frazier@canonical.com>
> ---
>  include/linux/ptrace.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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
>   *
>
Brad Figg Aug. 6, 2014, 7:43 p.m. UTC | #3
On 08/06/2014 07:46 AM, dann frazier wrote:
> commit c3208d7fd18a ("ptrace: fix fork event messages across pid namespaces")
> breaks building on arm64 due to a bad interaction (header loop) with
> c9c5b652e3d8 ("UBUNTU: ubuntu:aufs3 -- (no-up) aufs3-mmap.patch).
> 
> Fix this by avoiding the new include and just adding the needed prototype.
> 
> Reference: https://lists.ubuntu.com/archives/kernel-team/2014-August/047024.html
> Signed-off-by: dann frazier <dann.frazier@canonical.com>
> ---
>  include/linux/ptrace.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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
>   *
>
diff mbox

Patch

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
  *