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

uti: remove unused functions

Browse Source
This commit is contained in:
Tomoki Shirasawa
2017-07-26 13:14:30 +09:00
parent 86dedc32fa
commit b39fec1104
4 changed files with 7 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
executer/kernel/mcctrl/control.c
View File

@ -2399,7 +2399,6 @@ retry:
if (retval != minrr)
goto retry;
printk("sel cpu=%d rr=%d\n", mincpu, uti_rr[mincpu]);
for_each_cpu(i, cpumask) {
if (i != mincpu) {
cpumask_clear_cpu(i, cpumask);
@ -2432,13 +2431,8 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *arg)
}
if (copy_from_user(&desc, arg, sizeof desc))
return -EFAULT;
if (!(kattr = kmalloc(sizeof(struct kuti_attr), GFP_KERNEL)))
return -ENOMEM;
if (copy_from_user(kattr, (struct kuti_attr __user *)desc.attr,
sizeof(struct kuti_attr))) {
kfree(kattr);
return -EFAULT;
}
kattr = phys_to_virt(desc.phys_attr);
if (((kattr->attr.flags & UTI_FLAG_SAME_L1) &&
(kattr->attr.flags & UTI_FLAG_DIFFERENT_L1)) ||
@ -2448,12 +2442,10 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *arg)
(kattr->attr.flags & UTI_FLAG_DIFFERENT_L3)) ||
((kattr->attr.flags & UTI_FLAG_SAME_NUMA_DOMAIN) &&
(kattr->attr.flags & UTI_FLAG_DIFFERENT_NUMA_DOMAIN))) {
kfree(kattr);
return -EINVAL;
}
if (!(cpuset = kmalloc(mask_size * 2, GFP_KERNEL))) {
kfree(kattr);
return -ENOMEM;
}
wkmask = (cpumask_t *)(((char *)cpuset) + mask_size);
@ -2586,37 +2578,10 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *arg)
setaffinity(0, cpuset);
}
kfree(kattr);
kfree(cpuset);
return rc;
}
long
mcexec_copy_from_mck(ihk_os_t os, unsigned long *arg)
{
void __user *to = (void *)arg[0];
void *from = phys_to_virt(arg[1]);
long len = arg[2];
if (copy_to_user(to, from, len)) {
return -EFAULT;
}
return 0;
}
long
mcexec_copy_to_mck(ihk_os_t os, unsigned long *arg)
{
void *to = phys_to_virt(arg[0]);
void __user *from = (void *)arg[1];
long len = arg[2];
if (copy_from_user(to, from, len)) {
return -EFAULT;
}
return 0;
}
long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg,
struct file *file)
{
@ -2710,12 +2675,6 @@ long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg,
case MCEXEC_UP_UTI_ATTR:
return mcexec_uti_attr(os, (struct uti_attr_desc __user *)arg);
case MCEXEC_UP_COPY_FROM_MCK:
return mcexec_copy_from_mck(os, (unsigned long *)arg);
case MCEXEC_UP_COPY_TO_MCK:
return mcexec_copy_to_mck(os, (unsigned long *)arg);
case MCEXEC_UP_DEBUG_LOG:
return mcexec_debug_log(os, arg);

2
executer/kernel/mcctrl/driver.c
View File

@ -90,8 +90,6 @@ static struct ihk_os_user_call_handler mcctrl_uchs[] = {
{ .request = MCEXEC_UP_GET_NUM_POOL_THREADS, .func = mcctrl_ioctl },
{ .request = MCEXEC_UP_UTI_ATTR, .func = mcctrl_ioctl },
{ .request = MCEXEC_UP_DEBUG_LOG, .func = mcctrl_ioctl },
{ .request = MCEXEC_UP_COPY_FROM_MCK, .func = mcctrl_ioctl },
{ .request = MCEXEC_UP_COPY_TO_MCK, .func = mcctrl_ioctl },
{ .request = IHK_OS_AUX_PERF_NUM, .func = mcctrl_ioctl },
{ .request = IHK_OS_AUX_PERF_SET, .func = mcctrl_ioctl },
{ .request = IHK_OS_AUX_PERF_GET, .func = mcctrl_ioctl },