[uml-devel] [PATCH] skas3 update for linux 2.6.20-rc5

[uml-devel] [PATCH] skas3 update for linux 2.6.20-rc5

[Jason Lunz]

Between 2.6.19 and 2.6.20, an #else clause was added to the
#ifdef !__ASSEMBLY__ in arch/i386/desc.h. This results in the skas3
patch inserting a declaration into the assembly portion of the file.

This is fixed by moving the declaration back into the proper branch of
the #ifdef.

Jason


---
 include/asm-i386/desc.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.20-rc5/include/asm-i386/desc.h
===================================================================
--- linux-2.6.20-rc5.orig/include/asm-i386/desc.h
+++ linux-2.6.20-rc5/include/asm-i386/desc.h
@@ -185,6 +185,9 @@
 	return base;
 }
 
+extern int __modify_ldt(struct mm_struct * mm, int func, void __user *ptr,
+		      unsigned long bytecount);
+
 #else /* __ASSEMBLY__ */
 
 /*
@@ -208,9 +211,6 @@
 	shll $16, base; \
 	movw idx*8+2(gdt), lo_w;
 
-extern int __modify_ldt(struct mm_struct * mm, int func, void __user *ptr,
-		      unsigned long bytecount);
-
 #endif /* !__ASSEMBLY__ */
 
 #endif

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] [PATCH] skas3 update for linux 2.6.20-rc5

[Blaisorblade]

On Tuesday 16 January 2007 22:54, Jason Lunz wrote:
> Between 2.6.19 and 2.6.20, an #else clause was added to the
> #ifdef !__ASSEMBLY__ in arch/i386/desc.h. This results in the skas3
> patch inserting a declaration into the assembly portion of the file.
>
> This is fixed by moving the declaration back into the proper branch of
> the #ifdef.
>
> Jason
Ok, I've uploaded 2.6.20 with this change (I'm still in a hurry with exams but 
since 2.6.20 was released I had to).

I've also thanked you at the end of the home page for your help.

Bye!
-- 
Inform me of my mistakes, so I can add them to my list!
Paolo Giarrusso, aka Blaisorblade
http://www.user-mode-linux.org/~blaisorblade
Chiacchiera con i tuoi amici in tempo reale! 
 http://it.yahoo.com/mail_it/foot/*http://it.messenger.yahoo.com 


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel