From patchwork Wed Aug 6 14:46:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 377045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4F7D41400B5; Thu, 7 Aug 2014 00:46:24 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XF2Tr-0006cQ-Id; Wed, 06 Aug 2014 14:46:19 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XF2Tm-0006b0-Jf for kernel-team@lists.ubuntu.com; Wed, 06 Aug 2014 14:46:14 +0000 Received: from localhost (unknown [188.111.40.49]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 35CD733E00C3 for ; Wed, 6 Aug 2014 08:46:10 -0600 (MDT) Date: Wed, 6 Aug 2014 16:46:08 +0200 From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [Trusty][PATCH] UBUNTU: SAUCE: (no-up) Fix build failure on arm64 Message-ID: <20140806144608.GA24606@fluid.dannf> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Virus-Scanned: clamav-milter 0.98.1 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on complete.lackof.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 Signed-off-by: Chris J Arges --- 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 /* For struct task_struct. */ #include /* for IS_ERR_VALUE */ #include /* For BUG_ON. */ -#include /* For task_active_pid_ns. */ #include +extern struct pid_namespace *task_active_pid_ns(struct task_struct *tsk); + /* * Ptrace flags *