2007-12-14 16:18:13

by Jeff Dike

Subject: [PATCH] UML - Add asm/fixmap.h include

[ 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 <[email protected]>
---
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) \

2007-12-14 17:59:19

by Andrew Morton

Subject: Re: [PATCH] UML - Add asm/fixmap.h include

On Fri, 14 Dec 2007 11:16:47 -0500 Jeff Dike <[email protected]> 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 <[email protected]>
> ---
> 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?

2007-12-14 18:56:44

by Jeff Dike

Subject: Re: [PATCH] UML - Add asm/fixmap.h include

On Fri, Dec 14, 2007 at 09:58:40AM -0800, Andrew Morton wrote:
> arch/um/include/um_uaccess.h already includes fixmap.h. Is this a -mm-only
> fix?

Whoops, it is. The include was removed by uml-header-untangling.patch,
so folding this into that would work.

Jeff

--
Work email - jdike at linux dot intel dot com