aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2018-02-22 02:24:17 +0000
committerEd Maste <emaste@FreeBSD.org>2018-02-22 02:24:17 +0000
commiteae594f7d567f6e4abe04e96412683534e5c7109 (patch)
tree3f9a5d3ac59e5db010eb1fd56f49801cb657bbd6 /sys/i386
parent6619d9fb706d34ce65e4ffcfa2ae019f9f372ded (diff)
downloadsrc-eae594f7d567f6e4abe04e96412683534e5c7109.tar.gz
src-eae594f7d567f6e4abe04e96412683534e5c7109.zip
Correct proper nouns in the Linuxulator
- Capitalize Linux - Spell FreeBSD out in full - Address some style(9) on changed lines Sponsored by: Turing Robotic Industries Inc.
Notes
Notes: svn path=/head/; revision=329794
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/linux/imgact_linux.c2
-rw-r--r--sys/i386/linux/linux_dummy.c58
-rw-r--r--sys/i386/linux/linux_machdep.c10
-rw-r--r--sys/i386/linux/linux_ptrace.c2
-rw-r--r--sys/i386/linux/linux_sysvec.c10
-rw-r--r--sys/i386/linux/syscalls.master64
6 files changed, 73 insertions, 73 deletions
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 042f9758ff6b..f81eb10f887d 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -235,5 +235,5 @@ fail:
/*
* Tell kern_execve.c about it, with a little help from the linker.
*/
-static struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" };
+static struct execsw linux_execsw = { exec_linux_imgact, "Linux a.out" };
EXEC_SET(linuxaout, linux_execsw);
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 93801925890b..94bcb43f433a 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -47,19 +47,19 @@ LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
UNIMPLEMENTED(afs_syscall);
UNIMPLEMENTED(break);
-UNIMPLEMENTED(create_module); /* added in linux 1.0 removed in 2.6 */
+UNIMPLEMENTED(create_module); /* Added in Linux 1.0 removed in 2.6. */
UNIMPLEMENTED(ftime);
-UNIMPLEMENTED(get_kernel_syms); /* added in linux 1.0 removed in 2.6 */
+UNIMPLEMENTED(get_kernel_syms); /* Added in Linux 1.0 removed in 2.6. */
UNIMPLEMENTED(getpmsg);
UNIMPLEMENTED(gtty);
UNIMPLEMENTED(stty);
UNIMPLEMENTED(lock);
UNIMPLEMENTED(mpx);
-UNIMPLEMENTED(nfsservctl); /* added in linux 2.2 removed in 3.1 */
+UNIMPLEMENTED(nfsservctl); /* Added in Linux 2.2 removed in 3.1. */
UNIMPLEMENTED(prof);
UNIMPLEMENTED(profil);
UNIMPLEMENTED(putpmsg);
-UNIMPLEMENTED(query_module); /* added in linux 2.2 removed in 2.6 */
+UNIMPLEMENTED(query_module); /* Added in Linux 2.2 removed in 2.6. */
UNIMPLEMENTED(ulimit);
UNIMPLEMENTED(vserver);
@@ -88,74 +88,74 @@ DUMMY(mbind);
DUMMY(get_mempolicy);
DUMMY(set_mempolicy);
DUMMY(kexec_load);
-/* linux 2.6.11: */
+/* Linux 2.6.11: */
DUMMY(add_key);
DUMMY(request_key);
DUMMY(keyctl);
-/* linux 2.6.13: */
+/* Linux 2.6.13: */
DUMMY(ioprio_set);
DUMMY(ioprio_get);
DUMMY(inotify_init);
DUMMY(inotify_add_watch);
DUMMY(inotify_rm_watch);
-/* linux 2.6.16: */
+/* Linux 2.6.16: */
DUMMY(migrate_pages);
DUMMY(unshare);
-/* linux 2.6.17: */
+/* Linux 2.6.17: */
DUMMY(splice);
DUMMY(sync_file_range);
DUMMY(tee);
DUMMY(vmsplice);
-/* linux 2.6.18: */
+/* Linux 2.6.18: */
DUMMY(move_pages);
-/* linux 2.6.19: */
+/* Linux 2.6.19: */
DUMMY(getcpu);
-/* linux 2.6.22: */
+/* Linux 2.6.22: */
DUMMY(signalfd);
-/* linux 2.6.27: */
+/* Linux 2.6.27: */
DUMMY(signalfd4);
DUMMY(inotify_init1);
-/* linux 2.6.31: */
+/* Linux 2.6.31: */
DUMMY(perf_event_open);
-/* linux 2.6.33: */
+/* Linux 2.6.33: */
DUMMY(fanotify_init);
DUMMY(fanotify_mark);
-/* linux 2.6.39: */
+/* Linux 2.6.39: */
DUMMY(name_to_handle_at);
DUMMY(open_by_handle_at);
DUMMY(clock_adjtime);
-/* linux 3.0: */
+/* Linux 3.0: */
DUMMY(setns);
-/* linux 3.2: */
+/* Linux 3.2: */
DUMMY(process_vm_readv);
DUMMY(process_vm_writev);
-/* linux 3.5: */
+/* Linux 3.5: */
DUMMY(kcmp);
-/* linux 3.8: */
+/* Linux 3.8: */
DUMMY(finit_module);
DUMMY(sched_setattr);
DUMMY(sched_getattr);
-/* linux 3.14: */
+/* Linux 3.14: */
DUMMY(renameat2);
-/* linux 3.15: */
+/* Linux 3.15: */
DUMMY(seccomp);
DUMMY(memfd_create);
-/* linux 3.18: */
+/* Linux 3.18: */
DUMMY(bpf);
-/* linux 3.19: */
+/* Linux 3.19: */
DUMMY(execveat);
-/* linux 4.2: */
+/* Linux 4.2: */
DUMMY(userfaultfd);
-/* linux 4.3: */
+/* Linux 4.3: */
DUMMY(membarrier);
-/* linux 4.4: */
+/* Linux 4.4: */
DUMMY(mlock2);
-/* linux 4.5: */
+/* Linux 4.5: */
DUMMY(copy_file_range);
-/* linux 4.6: */
+/* Linux 4.6: */
DUMMY(preadv2);
DUMMY(pwritev2);
-/* linux 4.8: */
+/* Linux 4.8: */
DUMMY(pkey_mprotect);
DUMMY(pkey_alloc);
DUMMY(pkey_free);
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 4df82ce927f1..3bb07478b9ae 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -650,20 +650,20 @@ linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args
idx = info.entry_number;
/*
- * Semantics of linux version: every thread in the system has array of
+ * Semantics of Linux version: every thread in the system has array of
* 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This
* syscall loads one of the selected tls decriptors with a value and
* also loads GDT descriptors 6, 7 and 8 with the content of the
* per-thread descriptors.
*
- * Semantics of fbsd version: I think we can ignore that linux has 3
+ * Semantics of FreeBSD version: I think we can ignore that Linux has 3
* per-thread descriptors and use just the 1st one. The tls_array[]
* is used only in set/get-thread_area() syscalls and for loading the
- * GDT descriptors. In fbsd we use just one GDT descriptor for TLS so
- * we will load just one.
+ * GDT descriptors. In FreeBSD we use just one GDT descriptor for TLS
+ * so we will load just one.
*
* XXX: this doesn't work when a user space process tries to use more
- * than 1 TLS segment. Comment in the linux sources says wine might do
+ * than 1 TLS segment. Comment in the Linux sources says wine might do
* this.
*/
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index 5614772bab75..0c93d0266b87 100644
--- a/sys/i386/linux/linux_ptrace.c
+++ b/sys/i386/linux/linux_ptrace.c
@@ -412,7 +412,7 @@ linux_ptrace(struct thread *td, struct linux_ptrace_args *uap)
if (uap->addr < 0 || uap->addr & (sizeof(l_int) - 1))
break;
/*
- * Allow linux programs to access register values in
+ * Allow Linux programs to access register values in
* user struct. We simulate this through PT_GET/SETREGS
* as necessary.
*/
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 3d3304586da2..ab5c8731d0ab 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -880,9 +880,9 @@ linux_fetch_syscall_args(struct thread *td)
}
/*
- * If a linux binary is exec'ing something, try this image activator
+ * If a Linux binary is exec'ing something, try this image activator
* first. We override standard shell script execution in order to
- * be able to modify the interpreter path. We only do this if a linux
+ * be able to modify the interpreter path. We only do this if a Linux
* binary is doing the exec, so we do not create an EXEC module for it.
*/
static int exec_linux_imgact_try(struct image_params *iparams);
@@ -895,9 +895,9 @@ exec_linux_imgact_try(struct image_params *imgp)
int error = -1;
/*
- * The interpreter for shell scripts run from a linux binary needs
+ * The interpreter for shell scripts run from a Linux binary needs
* to be located in /compat/linux if possible in order to recursively
- * maintain linux path emulation.
+ * maintain Linux path emulation.
*/
if (((const short *)head)[0] == SHELLMAGIC) {
/*
@@ -1077,7 +1077,7 @@ linux_trans_osrel(const Elf_Note *note, int32_t *osrel)
return (FALSE);
/*
- * For linux we encode osrel as follows (see linux_mib.c):
+ * For Linux we encode osrel as follows (see linux_mib.c):
* VVVMMMIII (version, major, minor), see linux_mib.c.
*/
*osrel = desc[1] * 1000000 + desc[2] * 1000 + desc[3];
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 1a23b255e2fd..ff3aa6fcb0c4 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -465,7 +465,7 @@
274 AUE_NULL STD { int linux_mbind(void); }
275 AUE_NULL STD { int linux_get_mempolicy(void); }
276 AUE_NULL STD { int linux_set_mempolicy(void); }
-; linux 2.6.6:
+; Linux 2.6.6:
277 AUE_NULL STD { int linux_mq_open(const char *name, int oflag, mode_t mode, \
struct mq_attr *attr); }
278 AUE_NULL STD { int linux_mq_unlink(const char *name); }
@@ -483,17 +483,17 @@
l_siginfo_t *info, int options, \
void *rusage); }
285 AUE_NULL UNIMPL
-; linux 2.6.11:
+; Linux 2.6.11:
286 AUE_NULL STD { int linux_add_key(void); }
287 AUE_NULL STD { int linux_request_key(void); }
288 AUE_NULL STD { int linux_keyctl(void); }
-; linux 2.6.13:
+; Linux 2.6.13:
289 AUE_NULL STD { int linux_ioprio_set(void); }
290 AUE_NULL STD { int linux_ioprio_get(void); }
291 AUE_NULL STD { int linux_inotify_init(void); }
292 AUE_NULL STD { int linux_inotify_add_watch(void); }
293 AUE_NULL STD { int linux_inotify_rm_watch(void); }
-; linux 2.6.16:
+; Linux 2.6.16:
294 AUE_NULL STD { int linux_migrate_pages(void); }
295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, const char *filename, \
l_int flags, l_int mode); }
@@ -527,7 +527,7 @@
309 AUE_POLL STD { int linux_ppoll(struct pollfd *fds, uint32_t nfds, \
struct l_timespec *tsp, l_sigset_t *sset, l_size_t ssize); }
310 AUE_NULL STD { int linux_unshare(void); }
-; linux 2.6.17:
+; Linux 2.6.17:
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
l_size_t len); }
312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \
@@ -536,29 +536,29 @@
314 AUE_NULL STD { int linux_sync_file_range(void); }
315 AUE_NULL STD { int linux_tee(void); }
316 AUE_NULL STD { int linux_vmsplice(void); }
-; linux 2.6.18:
+; Linux 2.6.18:
317 AUE_NULL STD { int linux_move_pages(void); }
-; linux 2.6.19:
+; Linux 2.6.19:
318 AUE_NULL STD { int linux_getcpu(void); }
319 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \
l_int maxevents, l_int timeout, l_sigset_t *mask, \
l_size_t sigsetsize); }
-; linux 2.6.22:
+; Linux 2.6.22:
320 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \
const struct l_timespec *times, l_int flags); }
321 AUE_NULL STD { int linux_signalfd(void); }
322 AUE_NULL STD { int linux_timerfd_create(l_int clockid, l_int flags); }
323 AUE_NULL STD { int linux_eventfd(l_uint initval); }
-; linux 2.6.23:
+; Linux 2.6.23:
324 AUE_NULL STD { int linux_fallocate(l_int fd, l_int mode, \
l_loff_t offset, l_loff_t len); }
-; linux 2.6.25:
+; Linux 2.6.25:
325 AUE_NULL STD { int linux_timerfd_settime(l_int fd, l_int flags, \
const struct l_itimerspec *new_value, \
struct l_itimerspec *old_value); }
326 AUE_NULL STD { int linux_timerfd_gettime(l_int fd, \
struct l_itimerspec *old_value); }
-; linux 2.6.27:
+; Linux 2.6.27:
327 AUE_NULL STD { int linux_signalfd4(void); }
328 AUE_NULL STD { int linux_eventfd2(l_uint initval, l_int flags); }
329 AUE_NULL STD { int linux_epoll_create1(l_int flags); }
@@ -566,39 +566,39 @@
l_int newfd, l_int flags); }
331 AUE_NULL STD { int linux_pipe2(l_int *pipefds, l_int flags); }
332 AUE_NULL STD { int linux_inotify_init1(void); }
-; linux 2.6.30:
+; Linux 2.6.30:
333 AUE_NULL STD { int linux_preadv(l_ulong fd, \
struct iovec *vec, l_ulong vlen, \
l_ulong pos_l, l_ulong pos_h); }
334 AUE_NULL STD { int linux_pwritev(l_ulong fd, \
struct iovec *vec, l_ulong vlen, \
l_ulong pos_l, l_ulong pos_h); }
-; linux 2.6.31:
+; Linux 2.6.31:
335 AUE_NULL STD { int linux_rt_tgsigqueueinfo(l_pid_t tgid, \
l_pid_t tid, l_int sig, l_siginfo_t *uinfo); }
336 AUE_NULL STD { int linux_perf_event_open(void); }
-; linux 2.6.33:
+; Linux 2.6.33:
337 AUE_NULL STD { int linux_recvmmsg(l_int s, \
struct l_mmsghdr *msg, l_uint vlen, \
l_uint flags, struct l_timespec *timeout); }
338 AUE_NULL STD { int linux_fanotify_init(void); }
339 AUE_NULL STD { int linux_fanotify_mark(void); }
-; linux 2.6.36:
+; Linux 2.6.36:
340 AUE_NULL STD { int linux_prlimit64(l_pid_t pid, \
l_uint resource, \
struct rlimit *new, \
struct rlimit *old); }
-; linux 2.6.39:
+; Linux 2.6.39:
341 AUE_NULL STD { int linux_name_to_handle_at(void); }
342 AUE_NULL STD { int linux_open_by_handle_at(void); }
343 AUE_NULL STD { int linux_clock_adjtime(void); }
344 AUE_SYNC STD { int linux_syncfs(l_int fd); }
-; linux 3.0:
+; Linux 3.0:
345 AUE_NULL STD { int linux_sendmmsg(l_int s, \
struct l_mmsghdr *msg, l_uint vlen, \
l_uint flags); }
346 AUE_NULL STD { int linux_setns(void); }
-; linux 3.2 (glibc 2.15):
+; Linux 3.2 (glibc 2.15):
347 AUE_NULL STD { int linux_process_vm_readv(l_pid_t pid, \
const struct iovec *lvec, l_ulong liovcnt, \
const struct iovec *rvec, l_ulong riovcnt, \
@@ -607,36 +607,36 @@
const struct iovec *lvec, l_ulong liovcnt, \
const struct iovec *rvec, l_ulong riovcnt, \
l_ulong flags); }
-; linux 3.5 (no glibc wrapper):
+; Linux 3.5 (no glibc wrapper):
349 AUE_NULL STD { int linux_kcmp(l_pid_t pid1, l_pid_t pid2, \
l_int type, l_ulong idx1, l_ulong idx); }
-; linux 3.8 (no glibc wrapper):
+; Linux 3.8 (no glibc wrapper):
350 AUE_NULL STD { int linux_finit_module(l_int fd, \
const char *uargs, l_int flags); }
-; linux 3.14:
+; Linux 3.14:
351 AUE_NULL STD { int linux_sched_setattr(l_pid_t pid, \
void *attr, l_uint flags); }
352 AUE_NULL STD { int linux_sched_getattr(l_pid_t pid, \
void *attr, l_uint size, l_uint flags); }
-; linux 3.15:
+; Linux 3.15:
353 AUE_NULL STD { int linux_renameat2(l_int oldfd, \
const char *oldname, l_int newfd, \
const char *newname, unsigned int flags); }
-; linux 3.17:
+; Linux 3.17:
354 AUE_NULL STD { int linux_seccomp(l_uint op, l_uint flags, \
const char *uargs); }
355 AUE_NULL STD { int linux_getrandom(char *buf, \
l_size_t count, l_uint flags); }
356 AUE_NULL STD { int linux_memfd_create(const char *uname_ptr, \
l_uint flags); }
-; linux 3.18:
+; Linux 3.18:
357 AUE_NULL STD { int linux_bpf(l_int cmd, void *attr, \
l_uint size); }
-; linux 3.19:
+; Linux 3.19:
358 AUE_NULL STD { int linux_execveat(l_int dfd, \
const char *filename, const char **argv, \
const char **envp, l_int flags); }
-; linux 4.3: sockets now direct system calls:
+; Linux 4.3: sockets now direct system calls:
359 AUE_SOCKET STD { int linux_socket(l_int domain, l_int type, \
l_int protocol); }
360 AUE_SOCKETPAIR STD { int linux_socketpair(l_int domain, \
@@ -669,26 +669,26 @@
372 AUE_RECVMSG STD { int linux_recvmsg(l_int s, l_uintptr_t msg, \
l_int flags); }
373 AUE_NULL STD { int linux_shutdown(l_int s, l_int how); }
-; linux 4.2:
+; Linux 4.2:
374 AUE_NULL STD { int linux_userfaultfd(l_int flags); }
-; linux 4.3:
+; Linux 4.3:
375 AUE_NULL STD { int linux_membarrier(l_int cmd, l_int flags); }
-; linux 4.4:
+; Linux 4.4:
376 AUE_NULL STD { int linux_mlock2(l_ulong start, l_size_t len, \
l_int flags); }
-; linux 4.5:
+; Linux 4.5:
377 AUE_NULL STD { int linux_copy_file_range(l_int fd_in, \
l_loff_t *off_in, l_int fd_out, \
l_loff_t *off_out, l_size_t len, \
l_uint flags); }
-; linux 4.6:
+; Linux 4.6:
378 AUE_NULL STD { int linux_preadv2(l_ulong fd, \
const struct iovec *vec, l_ulong vlen, \
l_ulong pos_l, l_ulong pos_h, l_int flags); }
379 AUE_NULL STD { int linux_pwritev2(l_ulong fd, \
const struct iovec *vec, l_ulong vlen, \
l_ulong pos_l, l_ulong pos_h, l_int flags); }
-; linux 4.8:
+; Linux 4.8:
380 AUE_NULL STD { int linux_pkey_mprotect(l_ulong start, \
l_size_t len, l_ulong prot, l_int pkey); }
381 AUE_NULL STD { int linux_pkey_alloc(l_ulong flags, \