[3/4] arch: Reintroduce user_fpregs_struct_t on x86

Submitted by Pavel Emelianov on Sept. 26, 2016, 8:24 a.m.

Details

Message ID 57E8DB5B.4050300@virtuozzo.com
State Accepted
Series "Split get_task_regs routines"
Commit a4ed3d86bb9b394fe2678c931816175ccf162787
Headers show

Commit Message

Pavel Emelianov Sept. 26, 2016, 8:24 a.m.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/arch/x86/crtools.c           | 2 +-
 criu/arch/x86/include/asm/types.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index f222b55..d74efc3 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -195,7 +195,7 @@  int syscall_seized(struct parasite_ctl *ctl, int nr, unsigned long *ret,
 
 int get_task_regs(pid_t pid, user_regs_struct_t regs, CoreEntry *core)
 {
-	struct xsave_struct xsave	= {  };
+	user_fpregs_struct_t xsave	= {  };
 	UserX86RegsEntry *gpregs	= core->thread_info->gpregs;
 
 	struct iovec iov;
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index 7b38c50..a52587f 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -167,6 +167,7 @@  typedef struct {
 static inline int core_is_compat(CoreEntry *c) { return 0; }
 #endif /* !CONFIG_X86_64 */
 
+#if 0
 typedef struct {
 	unsigned short	cwd;
 	unsigned short	swd;
@@ -181,6 +182,9 @@  typedef struct {
 	u32		xmm_space[64];	/* 16*16 bytes for each XMM-reg = 256 bytes */
 	u32		padding[24];
 } user_fpregs_struct_t;
+#endif
+
+typedef struct xsave_struct user_fpregs_struct_t;
 
 #ifdef CONFIG_X86_64
 # define TASK_SIZE	((1UL << 47) - PAGE_SIZE)