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

Jeff Dike

author

2007-12-14 16:17 UTC #0 lore raw

PATCH 1/1 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(-)

arch/um/include/um_uaccess.h +2 -1

Index: linux-2.6.22/arch/um/include/um_uaccess.h
===================================================================
@@ -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) \

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Andrew Morton

2007-12-14 17:59 UTC #1 lore raw

Quoted 16 lines · 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
===================================================================

arch/um/include/um_uaccess.h line 13

Quoted 9 lines

arch/um/include/um_uaccess.h +2 -1

@@ -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?

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Jeff Dike

author

2007-12-14 18:55 UTC #2 lore raw

Quoted 2 lines · Andrew Morton

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

Signature · 12 lines

Work email - jdike at linux dot intel dot com

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel