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
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
