mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-04 16:25:31 +00:00
Code Issues Releases Wiki Activity

restorer: moved the routine restore_fpu() to the file arch/x86/crtools.c.

Browse Source 
Signed-off-by: Alexander Kartashov <alekskartashov@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Alexander Kartashov
2013-01-09 17:37:38 +04:00
committed by Pavel Emelyanov
parent ea6ab14d13
commit abc622b360
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/restorer.h
View File

@@ -73,4 +73,6 @@ struct rt_sigframe {
int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r); int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r);
int restore_fpu(struct rt_sigframe *sigframe, struct thread_restore_args *args);
#endif #endif

18
arch/x86/restorer.c
View File

@@ -5,6 +5,8 @@
#include "syscall.h" #include "syscall.h"
#include "log.h" #include "log.h"
#include "fpu.h"
#include "cpu.h"
int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r) int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
{ {
@@ -52,3 +54,19 @@ int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
return 0; return 0;
} }
int restore_fpu(struct rt_sigframe *sigframe, struct thread_restore_args *args)
{
if (args->has_fpu) {
unsigned long addr = (unsigned long)(void *)&args->xsave;
if ((addr % 64ul) == 0ul) {
sigframe->uc.uc_mcontext.fpstate = &args->xsave;
} else {
pr_err("Unaligned address passed: %lx\n", addr);
return -1;
}
}
return 0;
}

16
pie/restorer.c
View File

@@ -143,22 +143,6 @@ static void restore_sched_info(struct rst_sched_param *p)
sys_sched_setscheduler(0, p->policy, &parm); sys_sched_setscheduler(0, p->policy, &parm);
} }
static int restore_fpu(struct rt_sigframe *sigframe, struct thread_restore_args *args)
{
if (args->has_fpu) {
unsigned long addr = (unsigned long)(void *)&args->xsave;
if ((addr % 64ul) == 0ul) {
sigframe->uc.uc_mcontext.fpstate = &args->xsave;
} else {
pr_err("Unaligned address passed: %lx\n", addr);
return -1;
}
}
return 0;
}
static int restore_thread_common(struct rt_sigframe *sigframe, static int restore_thread_common(struct rt_sigframe *sigframe,
struct thread_restore_args *args) struct thread_restore_args *args)
{ {