Skip to contentSkip to conversation

um: fix compile error for tt

PATCH In review Pekka Enberg 2 participants 4 messages Dec 6, 2005 – Dec 7, 2005 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

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

The error only happens when I disable CONFIG_MODE_SKAS.

---

 uaccess-tt.h |    1 +
 1 file changed, 1 insertion(+)
arch/um/kernel/tt/include/uaccess-tt.h +1 -0
Index: 2.6/arch/um/kernel/tt/include/uaccess-tt.h
===================================================================
@@ -8,6 +8,7 @@
 
 #include "linux/string.h"
 #include "linux/sched.h"
+#include "asm/fixmap.h"
 #include "asm/processor.h"
 #include "asm/errno.h"
 #include "asm/current.h"

-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

#1 lore raw
Quoted 9 lines · Pekka Enberg

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.)

The error only happens when I disable CONFIG_MODE_SKAS.

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.

Signature · 11 lines
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it
#2 lore raw

Hi,

Quoted 8 lines · Blaisorblade

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.

---

 include/um_uaccess.h               |    2 ++
 kernel/skas/include/uaccess-skas.h |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/um/include/um_uaccess.h +2 -0
Index: 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))
arch/um/kernel/skas/include/uaccess-skas.h +0 -1
Index: 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
#3 lore raw
Quoted 5 lines · Pekka J Enberg

Hi,

Quoted 2 lines · Blaisorblade

Ok, fine, just a note - the header inclusion should be added to

Quoted 8 lines
Quoted 6 lines

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.

ACK - Andrew, please merge (and queue for -linus), or notify if it needs to be resent. Thanks.

Signature · 11 lines
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it