Patchwork UBUNTU: SAUCE: AppArmor -- add linux/err.h for ERR_PTR

login
register
mail settings
Submitter Andy Whitcroft
Date Dec. 15, 2009, 11:38 a.m.
Message ID <1260877097-23983-1-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/41179/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - Dec. 15, 2009, 11:38 a.m.
Include linux/err.h to get ERR_PTR for non-x86 architectures.  Fixes
compile failure.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 security/apparmor/match.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
John Johansen - Dec. 15, 2009, 5:07 p.m.
Andy Whitcroft wrote:
> Include linux/err.h to get ERR_PTR for non-x86 architectures.  Fixes
> compile failure.
> 
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>

also applied upstream

thanks


> ---
>  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 <linux/mm.h>
>  #include <linux/slab.h>
>  #include <linux/vmalloc.h>
> +#include <linux/err.h>
>  
>  #include "include/match.h"
>

Patch

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 <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/err.h>
 
 #include "include/match.h"