linux-um archives
 help / color / mirror / Atom feed
From: Jason Lunz <lunz@falooley.org>
To: Blaisorblade <blaisorblade@yahoo.it>
Cc: user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] [PATCH] skas3 update for linux 2.6.20-rc5
Date: Tue, 16 Jan 2007 16:54:00 -0500	[thread overview]
Message-ID: <20070116215400.GK28200@knob.reflex> (raw)


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

             reply	other threads:[~2007-01-16 21:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-16 21:54 Jason Lunz [this message]
2007-02-07 20:28 ` [uml-devel] [PATCH] skas3 update for linux 2.6.20-rc5 Blaisorblade

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070116215400.GK28200@knob.reflex \
    --to=lunz@falooley.org \
    --cc=blaisorblade@yahoo.it \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox