o Change the argument of linux_sigreturn to be a pointer to a

   struct sigframe. We need more than only the signal context.

o  Properly convert the signal mask when setting up the signal
   frame in linux_sendsig and properly convert it back in
   linux_sigreturn.

Do some cleanups and improve style while here.

1 files changed, 9 insertions, 10 deletions

diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 6d3e5a8..d253897 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -335,23 +335,22 @@ struct linux_fpstate {
  * It is appended to the frame to not interfere with the rest of it.
  */
 struct linux_sigframe {
-	int	sf_sig;
-	struct	linux_sigcontext sf_sc;
-	struct  linux_fpstate fpstate;
-	u_int	extramask[LINUX_NSIG_WORDS-1];
-	linux_handler_t sf_handler;
+	int			sf_sig;
+	struct linux_sigcontext sf_sc;
+	struct linux_fpstate	sf_fpstate;
+	u_int			sf_extramask[LINUX_NSIG_WORDS-1];
+	linux_handler_t		sf_handler;
 };
 
 struct linux_rt_sigframe {
 	int			sf_sig;
-	linux_siginfo_t 	*sf_siginfo;;
-	struct linux_ucontext	*sf_ucontext;	
-	linux_siginfo_t sf_si;
-	struct linux_ucontext 	sf_sc;          
+	linux_siginfo_t 	*sf_siginfo;
+	struct linux_ucontext	*sf_ucontext;
+	linux_siginfo_t		sf_si;
+	struct linux_ucontext 	sf_sc;
 	linux_handler_t 	sf_handler;
 };
 
-
 extern int bsd_to_linux_signal[];
 extern int linux_to_bsd_signal[];
 extern struct sysentvec linux_sysvec;