Re: [uml-devel] [PATCH] um: fix compile error for tt

[Pekka J E. <pe...@cs...>]

Hi,

On Wed, 7 Dec 2005, Blaisorblade wrote:
> Ok, fine, just a note - the header inclusion should be added to 
> 
> arch/um/include/um_uaccess.h
> 
> where it is effectively used (the offending macros, using FIXADDR_USER_*, are 
> __access_ok_vsyscall.
> 
> For the rest it's ok.

Here's an updated patch.

[PATCH] um: fix compile error for tt

Without the included patch, I get the following compile error for um:

arch/um/kernel/tt/uaccess.c: In function `copy_from_user_tt':
arch/um/kernel/tt/uaccess.c:11: error: `FIXADDR_USER_START' undeclared (first use in this function)
arch/um/kernel/tt/uaccess.c:11: error: (Each undeclared identifier is reported only once
arch/um/kernel/tt/uaccess.c:11: error: for each function it appears in.)

I get the compile error when I disable CONFIG_MODE_SKAS.

Signed-off-by: Pekka Enberg <pe...@cs...>
---

 include/um_uaccess.h               |    2 ++
 kernel/skas/include/uaccess-skas.h |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: 2.6/arch/um/include/um_uaccess.h
===================================================================
--- 2.6.orig/arch/um/include/um_uaccess.h
+++ 2.6/arch/um/include/um_uaccess.h
@@ -17,6 +17,8 @@
 #include "uaccess-skas.h"
 #endif
 
+#include "asm/fixmap.h"
+
 #define __under_task_size(addr, size) \
 	(((unsigned long) (addr) < TASK_SIZE) && \
          (((unsigned long) (addr) + (size)) < TASK_SIZE))
Index: 2.6/arch/um/kernel/skas/include/uaccess-skas.h
===================================================================
--- 2.6.orig/arch/um/kernel/skas/include/uaccess-skas.h
+++ 2.6/arch/um/kernel/skas/include/uaccess-skas.h
@@ -7,7 +7,6 @@
 #define __SKAS_UACCESS_H
 
 #include "asm/errno.h"
-#include "asm/fixmap.h"
 
 /* No SKAS-specific checking. */
 #define access_ok_skas(type, addr, size) 0