From patchwork Tue Dec 15 11:38:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 41179 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5B8A0B7B64 for ; Tue, 15 Dec 2009 22:38:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NKVjR-0004bc-A8; Tue, 15 Dec 2009 11:38:21 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NKVjP-0004bX-8n for kernel-team@lists.ubuntu.com; Tue, 15 Dec 2009 11:38:19 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NKVjP-000675-4p; Tue, 15 Dec 2009 11:38:19 +0000 Received: from 79-66-207-78.dynamic.dsl.as9105.com ([79.66.207.78] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NKVjO-00050B-Vx; Tue, 15 Dec 2009 11:38:19 +0000 From: Andy Whitcroft To: John Johansen Subject: [PATCH] UBUNTU: SAUCE: AppArmor -- add linux/err.h for ERR_PTR Date: Tue, 15 Dec 2009 11:38:17 +0000 Message-Id: <1260877097-23983-1-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.6.3.3 Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Include linux/err.h to get ERR_PTR for non-x86 architectures. Fixes compile failure. Signed-off-by: Andy Whitcroft Acked-by: John Johansen --- security/apparmor/match.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/security/apparmor/match.c b/security/apparmor/match.c index c04dbcd..fcb48c5 100644 --- a/security/apparmor/match.c +++ b/security/apparmor/match.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "include/match.h"