converted a few more


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2987 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/x86-linux/vki_arch.h b/include/x86-linux/vki_arch.h
index aed2b72..4f8b2eb 100644
--- a/include/x86-linux/vki_arch.h
+++ b/include/x86-linux/vki_arch.h
@@ -156,11 +156,19 @@
 #define VKI_SS_ONSTACK	1
 #define VKI_SS_DISABLE	2
 
-struct vki_sigaction {
+struct vki_old_sigaction {
         // [[Nb: a 'k' prefix is added to "sa_handler" because
         // bits/sigaction.h (which gets dragged in somehow via signal.h)
         // #defines it as something else.  Since that is done for glibc's
         // purposes, which we don't care about here, we use our own name.]]
+        __vki_sighandler_t ksa_handler;
+        vki_old_sigset_t sa_mask;
+        unsigned long sa_flags;
+        __vki_sigrestore_t sa_restorer;
+};
+
+struct vki_sigaction {
+        // [[See comment about extra 'k' above]]
 	__vki_sighandler_t ksa_handler;
 	unsigned long sa_flags;
 	__vki_sigrestore_t sa_restorer;