gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/syscall.c: cleanup? pass virt_to_phys directly to do_futex

Browse Source 
Change-Id: I196ebe5d5cdc577fce442bcd2247d07e85d2b9ff
This commit is contained in:
Dominique Martinet
2019-01-31 11:20:46 +09:00
parent 49353e252b
commit 859e976348
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/syscall.c
View File

@@ -5760,18 +5760,13 @@ long do_futex(int n, unsigned long arg0, unsigned long arg1,
struct syscall_request request IHK_DMA_ALIGN; struct syscall_request request IHK_DMA_ALIGN;
struct timespec tv[2]; struct timespec tv[2];
struct timespec *tv_now = tv; struct timespec *tv_now = tv;
request.number = n;
unsigned long __phys;
if ((((unsigned long)tv) ^ if ((((unsigned long)tv) ^
((unsigned long)(tv + 1))) & PAGE_MASK) ((unsigned long)(tv + 1))) & PAGE_MASK)
tv_now = tv + 1; tv_now = tv + 1;
if (ihk_mc_pt_virt_to_phys(cpu_local_var(current)->vm->address_space->page_table,
(void *)tv_now, &__phys)) {
return -EFAULT;
}
request.args[0] = __phys; request.number = n;
request.args[0] = virt_to_phys(tv_now);
request.args[1] = (flags & FUTEX_CLOCK_REALTIME)? request.args[1] = (flags & FUTEX_CLOCK_REALTIME)?
CLOCK_REALTIME: CLOCK_MONOTONIC; CLOCK_REALTIME: CLOCK_MONOTONIC;
@@ -9420,12 +9415,8 @@ int util_thread(struct uti_attr *arg)
} }
out: out:
if (rctx) { kfree(rctx);
kfree(rctx); kfree(uti_clv);
}
if (uti_clv) {
kfree(uti_clv);
}
return rc; return rc;
} }