Date: Fri, 14 Dec 2007 09:58:40 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: Jeff Dike <jdike@addtoit.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
       uml-devel <user-mode-linux-devel@lists.sourceforge.net>,
       Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] UML - Add asm/fixmap.h include
Message-Id: <20071214095840.28736204.akpm@linux-foundation.org>
In-Reply-To: <20071214161647.GA5802@c2.user-mode-linux.org>
References: <20071214161647.GA5802@c2.user-mode-linux.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1312
Lines: 36

On Fri, 14 Dec 2007 11:16:47 -0500 Jeff Dike <jdike@addtoit.com> wrote:

> [ This needs to go into 2.6.24, as it fixes a build breakage seen on x86_64 ]
> 
> um_uaccess.h refers to FIXADDR_USER_*, so it should include fixmap.h.
> 
> I also changed the non-UML includes to use <> instead of "".
> 
> Signed-off-by: Jeff Dike <jdike@linux.intel.com>
> ---
>  arch/um/include/um_uaccess.h |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6.22/arch/um/include/um_uaccess.h
> ===================================================================
> --- linux-2.6.22.orig/arch/um/include/um_uaccess.h	2007-12-13 10:09:22.000000000 -0500
> +++ linux-2.6.22/arch/um/include/um_uaccess.h	2007-12-13 15:11:42.000000000 -0500
> @@ -6,7 +6,8 @@
>  #ifndef __ARCH_UM_UACCESS_H
>  #define __ARCH_UM_UACCESS_H
>  
> -#include "asm/elf.h"
> +#include <asm/elf.h>
> +#include <asm/fixmap.h>
>  #include "sysdep/archsetjmp.h"
>  
>  #define __under_task_size(addr, size) \

arch/um/include/um_uaccess.h already includes fixmap.h.  Is this a -mm-only
fix?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/