diff options
author | Ed Maste <emaste@FreeBSD.org> | 2018-02-05 17:29:12 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2018-02-05 17:29:12 +0000 |
commit | 132f90c660e08037d238bb9557475b83cc9e2861 (patch) | |
tree | 9cfcd6adf3f0a9c36e1eff327cae81a10e52aa8f /sys/compat | |
parent | fdc154e44aab68b3f6729cb37c95b2b9d0fb1396 (diff) |
Notes
Diffstat (limited to 'sys/compat')
-rw-r--r-- | sys/compat/linux/check_internal_locks.d | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_emul.c | 8 | ||||
-rw-r--r-- | sys/compat/linux/linux_event.c | 10 | ||||
-rw-r--r-- | sys/compat/linux/linux_file.h | 8 | ||||
-rw-r--r-- | sys/compat/linux/linux_fork.c | 16 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 14 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.h | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_ipc.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_ipc.h | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_ipc64.h | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_misc.c | 8 | ||||
-rw-r--r-- | sys/compat/linux/linux_persona.h | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_signal.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_socket.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_socket.h | 14 | ||||
-rw-r--r-- | sys/compat/linux/linux_time.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_util.h | 2 | ||||
-rw-r--r-- | sys/compat/linux/stats_timing.d | 2 | ||||
-rw-r--r-- | sys/compat/linux/trace_futexes.d | 6 |
19 files changed, 58 insertions, 58 deletions
diff --git a/sys/compat/linux/check_internal_locks.d b/sys/compat/linux/check_internal_locks.d index 644323e43a733..d3032c06c5127 100644 --- a/sys/compat/linux/check_internal_locks.d +++ b/sys/compat/linux/check_internal_locks.d @@ -92,6 +92,6 @@ tick-10s END { - printf("Number of locks per type:"); + printf("Number of locks per type:"); printa(@stats); } diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index ce82bd75a34ee..3cc24ce0c2bb5 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -140,7 +140,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, int flags) } -void +void linux_proc_exit(void *arg __unused, struct proc *p) { struct linux_pemuldata *pem; @@ -155,7 +155,7 @@ linux_proc_exit(void *arg __unused, struct proc *p) pem = pem_find(p); if (pem == NULL) - return; + return; (p->p_sysent->sv_thread_detach)(td); p->p_emuldata = NULL; @@ -170,7 +170,7 @@ linux_proc_exit(void *arg __unused, struct proc *p) free(pem, M_LINUX); } -int +int linux_common_execve(struct thread *td, struct image_args *eargs) { struct linux_pemuldata *pem; @@ -218,7 +218,7 @@ linux_common_execve(struct thread *td, struct image_args *eargs) return (EJUSTRETURN); } -void +void linux_proc_exec(void *arg __unused, struct proc *p, struct image_params *imgp) { struct thread *td = curthread; diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 84639c9c9ed23..e2779b4fb12b7 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -343,7 +343,7 @@ epoll_to_kevent(struct thread *td, struct file *epfp, return (0); } -/* +/* * Structure converting function from kevent to epoll. In a case * this is called on error in registration we store the error in * event->data and pick it up later in linux_epoll_ctl(). @@ -370,7 +370,7 @@ kevent_to_epoll(struct kevent *kevent, struct epoll_event *l_event) } } -/* +/* * Copyout callback used by kevent. This converts kevent * events to epoll events and copies them back to the * userspace. This is also called on error on registering @@ -417,7 +417,7 @@ epoll_kev_copyout(void *arg, struct kevent *kevp, int count) /* * Copyin callback used by kevent. This copies already - * converted filters from kernel memory to the kevent + * converted filters from kernel memory to the kevent * internal kernel memory. Hence the memcpy instead of * copyin. */ @@ -600,7 +600,7 @@ linux_epoll_wait_common(struct thread *td, int epfd, struct epoll_event *events, if (error == 0 && coargs.error != 0) error = coargs.error; - /* + /* * kern_kevent might return ENOMEM which is not expected from epoll_wait. * Maybe we should translate that but I don't think it matters at all. */ @@ -696,7 +696,7 @@ eventfd_create(struct thread *td, uint32_t initval, int flags) knlist_init_mtx(&efd->efd_sel.si_note, &efd->efd_lock); - fflags = FREAD | FWRITE; + fflags = FREAD | FWRITE; if ((flags & LINUX_O_NONBLOCK) != 0) fflags |= FNONBLOCK; diff --git a/sys/compat/linux/linux_file.h b/sys/compat/linux/linux_file.h index 17450092b20ad..928be024de2e2 100644 --- a/sys/compat/linux/linux_file.h +++ b/sys/compat/linux/linux_file.h @@ -42,10 +42,10 @@ */ #define LINUX_POSIX_FADV_NORMAL 0 #define LINUX_POSIX_FADV_RANDOM 1 -#define LINUX_POSIX_FADV_SEQUENTIAL 2 -#define LINUX_POSIX_FADV_WILLNEED 3 -#define LINUX_POSIX_FADV_DONTNEED 4 -#define LINUX_POSIX_FADV_NOREUSE 5 +#define LINUX_POSIX_FADV_SEQUENTIAL 2 +#define LINUX_POSIX_FADV_WILLNEED 3 +#define LINUX_POSIX_FADV_DONTNEED 4 +#define LINUX_POSIX_FADV_NOREUSE 5 /* * mount flags diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 104679e08588e..9dda457e8481b 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -123,7 +123,7 @@ linux_vfork(struct thread *td, struct linux_vfork_args *args) linux_proc_init(td, td2, 0); - td->td_retval[0] = p2->p_pid; + td->td_retval[0] = p2->p_pid; /* * Make this runnable after we are finished with it. @@ -198,12 +198,12 @@ linux_clone_proc(struct thread *td, struct linux_clone_args *args) if (args->flags & LINUX_CLONE_CHILD_SETTID) em->child_set_tid = args->child_tidptr; else - em->child_set_tid = NULL; + em->child_set_tid = NULL; if (args->flags & LINUX_CLONE_CHILD_CLEARTID) em->child_clear_tid = args->child_tidptr; else - em->child_clear_tid = NULL; + em->child_clear_tid = NULL; if (args->flags & LINUX_CLONE_PARENT_SETTID) { error = copyout(&p2->p_pid, args->parent_tidptr, @@ -226,7 +226,7 @@ linux_clone_proc(struct thread *td, struct linux_clone_args *args) linux_set_cloned_tls(td2, args->tls); /* - * If CLONE_PARENT is set, then the parent of the new process will be + * If CLONE_PARENT is set, then the parent of the new process will be * the same as that of the calling process. */ if (args->flags & LINUX_CLONE_PARENT) { @@ -324,15 +324,15 @@ linux_clone_thread(struct thread *td, struct linux_clone_args *args) if (args->flags & LINUX_CLONE_CHILD_SETTID) em->child_set_tid = args->child_tidptr; else - em->child_set_tid = NULL; + em->child_set_tid = NULL; if (args->flags & LINUX_CLONE_CHILD_CLEARTID) em->child_clear_tid = args->child_tidptr; else - em->child_clear_tid = NULL; + em->child_clear_tid = NULL; cpu_thread_clean(newtd); - + linux_set_upcall_kse(newtd, PTROUT(args->stack)); PROC_LOCK(p); @@ -465,7 +465,7 @@ linux_thread_detach(struct thread *td) LINUX_CTR2(thread_detach, "thread(%d) %p", em->em_tid, child_clear_tid); - + error = suword32(child_clear_tid, 0); if (error != 0) return; diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 9e4b744cb3efd..51373d433930a 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -241,7 +241,7 @@ linux_ioctl_hdio(struct thread *td, struct linux_ioctl_args *args) #if defined(DEBUG) linux_msg(td, "HDIO_GET_GEO: mediasize %jd, c/h/s %d/%d/%d, " "bpc %jd", - (intmax_t)mediasize, fwcylinders, fwheads, fwsectors, + (intmax_t)mediasize, fwcylinders, fwheads, fwsectors, (intmax_t)bytespercyl); #endif if ((args->cmd & 0xffff) == LINUX_HDIO_GET_GEO) { @@ -1050,7 +1050,7 @@ linux_ioctl_termio(struct thread *td, struct linux_ioctl_args *args) break; case LINUX_TIOCGPTN: { int nb; - + error = fo_ioctl(fp, TIOCGPTN, (caddr_t)&nb, td->td_ucred, td); if (!error) error = copyout(&nb, (void *)args->arg, @@ -2319,7 +2319,7 @@ again: goto again; } - ifc.ifc_len = valid_len; + ifc.ifc_len = valid_len; sbuf_finish(sb); error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len); if (error == 0) @@ -2393,12 +2393,12 @@ bsd_to_linux_ifreq(struct ifreq *arg) struct ifreq ifr; size_t ifr_len = sizeof(struct ifreq); int error; - + if ((error = copyin(arg, &ifr, ifr_len))) return (error); - + *(u_short *)&ifr.ifr_addr = ifr.ifr_addr.sa_family; - + error = copyout(&ifr, arg, ifr_len); return (error); @@ -2980,7 +2980,7 @@ linux_v4l_cliplist_copy(struct l_video_window *lvw, struct video_window *vw) } } ppvc = &((*ppvc)->next); - plvc = PTRIN(((struct l_video_clip *) plvc)->next); + plvc = PTRIN(((struct l_video_clip *) plvc)->next); } } else { /* diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 34a2063f62219..d2d1ab5443fee 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -252,7 +252,7 @@ #define LINUX_IOCTL_SOCKET_MAX LINUX_SIOCGIFCOUNT /* - * Device private ioctl calls + * Device private ioctl calls */ #define LINUX_SIOCDEVPRIVATE 0x89F0 /* to 89FF */ #define LINUX_IOCTL_PRIVATE_MIN LINUX_SIOCDEVPRIVATE @@ -430,7 +430,7 @@ /* In addition to the termio values */ #define LINUX_VSTART 8 #define LINUX_VSTOP 9 -#define LINUX_VSUSP 10 +#define LINUX_VSUSP 10 #define LINUX_VEOL 11 #define LINUX_VREPRINT 12 #define LINUX_VDISCARD 13 diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 2a38cc4ca9365..c1a58589e2294 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -731,8 +731,8 @@ linux_msgctl(struct thread *td, struct linux_msgctl_args *args) return (error); } - /* - * TODO: implement this + /* + * TODO: implement this * case LINUX_MSG_STAT: */ case LINUX_IPC_STAT: diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h index 6761a472dfcc0..db8dd091a2fc3 100644 --- a/sys/compat/linux/linux_ipc.h +++ b/sys/compat/linux/linux_ipc.h @@ -86,7 +86,7 @@ #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) -struct linux_msgctl_args +struct linux_msgctl_args { l_int msqid; l_int cmd; diff --git a/sys/compat/linux/linux_ipc64.h b/sys/compat/linux/linux_ipc64.h index d57c7fe558eb1..f0aa5618dff13 100644 --- a/sys/compat/linux/linux_ipc64.h +++ b/sys/compat/linux/linux_ipc64.h @@ -149,7 +149,7 @@ struct l_shminfo64 { l_ulong shmmni; l_ulong shmseg; l_ulong shmall; - l_ulong __unused1; + l_ulong __unused1; l_ulong __unused2; l_ulong __unused3; l_ulong __unused4; diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 59492dad5a6ab..e8823a7c01a5a 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -116,7 +116,7 @@ int stclohz; /* Statistics clock frequency */ static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = { RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK, RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NPROC, RLIMIT_NOFILE, - RLIMIT_MEMLOCK, RLIMIT_AS + RLIMIT_MEMLOCK, RLIMIT_AS }; struct l_sysinfo { @@ -839,7 +839,7 @@ linux_utimensat_nsec_valid(l_long nsec) return (1); } -int +int linux_utimensat(struct thread *td, struct linux_utimensat_args *args) { struct l_timespec l_times[2]; @@ -914,7 +914,7 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args) error = kern_futimens(td, dfd, timesp, UIO_SYSSPACE); else { error = kern_utimensat(td, dfd, path, UIO_SYSSPACE, timesp, - UIO_SYSSPACE, flags); + UIO_SYSSPACE, flags); LFREEPATH(path); } @@ -1222,7 +1222,7 @@ struct l_itimerval { l_timeval it_value; }; -#define B2L_ITIMERVAL(bip, lip) \ +#define B2L_ITIMERVAL(bip, lip) \ (bip)->it_interval.tv_sec = (lip)->it_interval.tv_sec; \ (bip)->it_interval.tv_usec = (lip)->it_interval.tv_usec; \ (bip)->it_value.tv_sec = (lip)->it_value.tv_sec; \ diff --git a/sys/compat/linux/linux_persona.h b/sys/compat/linux/linux_persona.h index 8d8413486c702..7ae166aeb2cfd 100644 --- a/sys/compat/linux/linux_persona.h +++ b/sys/compat/linux/linux_persona.h @@ -12,7 +12,7 @@ */ enum { LINUX_UNAME26 = 0x0020000, - LINUX_ADDR_NO_RANDOMIZE = 0x0040000, /* disable randomization + LINUX_ADDR_NO_RANDOMIZE = 0x0040000, /* disable randomization * of VA space */ LINUX_FDPIC_FUNCPTRS = 0x0080000, /* userspace function diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 19a34fdd7b2e2..d19642bde6e97 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -436,7 +436,7 @@ linux_rt_sigtimedwait(struct thread *td, tv.tv_sec = (long)ltv.tv_sec; tv.tv_usec = (suseconds_t)ltv.tv_usec; if (itimerfix(&tv)) { - /* + /* * The timeout was invalid. Convert it to something * valid that will act as it does under Linux. */ @@ -475,7 +475,7 @@ linux_rt_sigtimedwait(struct thread *td, error = copyout(&linfo, args->ptr, sizeof(linfo)); } if (error == 0) - td->td_retval[0] = sig; + td->td_retval[0] = sig; return (error); } diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index edb3dd5e2cda3..46a7dd69dffa7 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -170,7 +170,7 @@ linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int salen) name = ((struct sockaddr_un *)kosa)->sun_path; if (*name == '\0') { /* - * Linux abstract namespace starts with a NULL byte. + * Linux abstract namespace starts with a NULL byte. * XXX We do not support abstract namespace yet. */ namelen = strnlen(name + 1, salen - hdrlen - 1) + 1; @@ -761,7 +761,7 @@ linux_bind(struct thread *td, struct linux_bind_args *args) error = kern_bindat(td, AT_FDCWD, args->s, sa); free(sa, M_SONAME); if (error == EADDRNOTAVAIL && args->namelen != sizeof(struct sockaddr_in)) - return (EINVAL); + return (EINVAL); return (error); } diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index b3cc60e845839..cd12ab61c469a 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -152,19 +152,19 @@ struct linux_accept_args { int linux_accept(struct thread *td, struct linux_accept_args *args); /* Operations for socketcall */ -#define LINUX_SOCKET 1 +#define LINUX_SOCKET 1 #define LINUX_BIND 2 -#define LINUX_CONNECT 3 -#define LINUX_LISTEN 4 -#define LINUX_ACCEPT 5 +#define LINUX_CONNECT 3 +#define LINUX_LISTEN 4 +#define LINUX_ACCEPT 5 #define LINUX_GETSOCKNAME 6 #define LINUX_GETPEERNAME 7 #define LINUX_SOCKETPAIR 8 #define LINUX_SEND 9 #define LINUX_RECV 10 -#define LINUX_SENDTO 11 -#define LINUX_RECVFROM 12 -#define LINUX_SHUTDOWN 13 +#define LINUX_SENDTO 11 +#define LINUX_RECVFROM 12 +#define LINUX_SHUTDOWN 13 #define LINUX_SETSOCKOPT 14 #define LINUX_GETSOCKOPT 15 #define LINUX_SENDMSG 16 diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 5bbabbcbb0e22..ad3f7ad5c6146 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -437,7 +437,7 @@ linux_clock_getres(struct thread *td, struct linux_clock_getres_args *args) } /* - * Check user supplied clock id in case of per-process + * Check user supplied clock id in case of per-process * or thread-specific cpu-time clock. */ switch (nwhich) { @@ -464,7 +464,7 @@ linux_clock_getres(struct thread *td, struct linux_clock_getres_args *args) if (args->tp == NULL) { LIN_SDT_PROBE0(time, linux_clock_getres, nullcall); LIN_SDT_PROBE1(time, linux_clock_getres, return, 0); - return (0); + return (0); } switch (nwhich) { diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 68c2498a556ec..821e07a100f9f 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -64,7 +64,7 @@ int linux_emul_convpath(struct thread *, const char *, enum uio_seg, char **, in return (_error); \ } while (0) -#define LCONVPATH(td, upath, pathp, i) \ +#define LCONVPATH(td, upath, pathp, i) \ LCONVPATH_AT(td, upath, pathp, i, AT_FDCWD) #define LCONVPATHEXIST(td, upath, pathp) LCONVPATH(td, upath, pathp, 0) diff --git a/sys/compat/linux/stats_timing.d b/sys/compat/linux/stats_timing.d index 1b60dc98689a1..66a813a9af921 100644 --- a/sys/compat/linux/stats_timing.d +++ b/sys/compat/linux/stats_timing.d @@ -57,7 +57,7 @@ linuxulator*:::return @stats[probeprov, execname, probefunc] = quantize(this->timediff); @longest[probeprov, probefunc] = max(this->timediff); - + self->time[probefunc] = 0; } diff --git a/sys/compat/linux/trace_futexes.d b/sys/compat/linux/trace_futexes.d index d8879fc779512..94129212043aa 100644 --- a/sys/compat/linux/trace_futexes.d +++ b/sys/compat/linux/trace_futexes.d @@ -157,10 +157,10 @@ linuxulator*:futex::return { this->timediff = self->time[probefunc] - timestamp; - @timestats[probeprov, execname, probefunc] = quantize(this->timediff); - @longest[probeprov, probefunc] = max(this->timediff); + @timestats[probeprov, execname, probefunc] = quantize(this->timediff); + @longest[probeprov, probefunc] = max(this->timediff); - self->time[probefunc] = 0; + self->time[probefunc] = 0; } |