[CRIU] [PATCH 1/6] compel: arch, x86 -- Make rt_sigcontext_32 members being close to kernel

[Cyrill Gorcunov]

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/arch/x86/src/lib/include/uapi/asm/sigframe.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
index 21cd341c0393..619935b0e1e9 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
@@ -41,10 +41,10 @@ struct rt_sigcontext {
 };
 
 struct rt_sigcontext_32 {
-	uint32_t			gs;
-	uint32_t			fs;
-	uint32_t			es;
-	uint32_t			ds;
+	uint16_t			gs, __gsh;
+	uint16_t			fs, __fsh;
+	uint16_t			es, __esh;
+	uint16_t			ds, __dsh;
 	uint32_t			di;
 	uint32_t			si;
 	uint32_t			bp;
@@ -56,11 +56,10 @@ struct rt_sigcontext_32 {
 	uint32_t			trapno;
 	uint32_t			err;
 	uint32_t			ip;
-	uint32_t			cs;
+	uint16_t			cs, __csh;
 	uint32_t			flags;
 	uint32_t			sp_at_signal;
-	uint32_t			ss;
-
+	uint16_t			ss, __ssh;
 	uint32_t			fpstate;
 	uint32_t			oldmask;
 	uint32_t			cr2;
-- 
2.7.4