diff --git a/lib/msun/man/cacos.3 b/lib/msun/man/cacos.3 index 0bf3f0fd4263..02f3f7454791 100644 --- a/lib/msun/man/cacos.3 +++ b/lib/msun/man/cacos.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 27, 2013 +.Dd Jul 14, 2015 .Dt CACOS 3 .Os .Sh NAME @@ -98,11 +98,7 @@ functions perform the same operations in .Fa float precision. .Pp -.ie '\*[.T]'utf8' -. ds Un \[cu] -.el -. ds Un U -. +.ds Un \[cu] There is no universal convention for defining the principal values of these functions. The following table gives the branch cuts, and the corresponding ranges for the return values, adopted by the C language. diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml index 441284f817dd..557ee5746a0b 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.xml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml @@ -1095,7 +1095,7 @@ I/O, and uses hardware virtualization extensions for all other tasks, without the need for emulation. - The &man.bhyve.8; hypervisior has been + The &man.bhyve.8; hypervisor has been updated to support &amd; processors with SVM and AMD-V hardware extensions. diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8 index 8545bafb1e85..705d42f657c2 100644 --- a/sbin/ggate/ggatec/ggatec.8 +++ b/sbin/ggate/ggatec/ggatec.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 2, 2015 +.Dd July 14, 2015 .Dt GGATEC 8 .Os .Sh NAME @@ -71,8 +71,8 @@ utility is a network client for the GEOM Gate class. It is responsible for the creation of .Nm ggate devices and forwarding I/O requests between the -.Nm geom_gate.ko -kernel module and the +.Nm GEOM Gate +kernel subsystem and the .Xr ggated 8 network daemon. Available commands: @@ -111,7 +111,7 @@ Do not use .Dv TCP_NODELAY option on TCP sockets. .It Fl o Cm ro | wo | rw -Specify permission to use when opening the file or device: read-only +Specify permissions to use when opening the file or device: read-only .Pq Cm ro , write-only .Pq Cm wo , @@ -136,7 +136,7 @@ Default is 131072 (128kB). Sector size for .Nm ggate provider. -If not specified, it is taken from device, or set to 512 bytes for files. +If not specified, it is taken from the device, or set to 512 bytes for files. .It Fl t Ar timeout Number of seconds to wait before an I/O request will be canceled. Default is 0, which means no timeout. diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c index 6f9263c8c30d..ea4f701abafa 100644 --- a/sbin/ggate/ggatec/ggatec.c +++ b/sbin/ggate/ggatec/ggatec.c @@ -447,6 +447,7 @@ g_gatec_create(void) /* * Ok, got both sockets, time to create provider. */ + memset(&ggioc, 0, sizeof(ggioc)); ggioc.gctl_version = G_GATE_VERSION; ggioc.gctl_mediasize = mediasize; ggioc.gctl_sectorsize = sectorsize; diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8 index 3560fe0bc9b5..dd6109aa61ef 100644 --- a/sbin/ggate/ggated/ggated.8 +++ b/sbin/ggate/ggated/ggated.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 29, 2004 +.Dd July 14, 2015 .Dt GGATED 8 .Os .Sh NAME @@ -43,14 +43,14 @@ .Sh DESCRIPTION The .Nm -utility is a network server for GEOM Gate class. +utility is a network server for the GEOM Gate class. It runs on a server machine to service GEOM Gate requests from workers placed on a client machine. -Keep in mind, that connection between +Keep in mind, that connections between .Xr ggatec 8 and .Nm -is not encrypted. +are not encrypted. .Pp Available options: .Bl -tag -width ".Ar exports\ file" @@ -65,7 +65,7 @@ option on TCP sockets. .It Fl p Ar port Port on which .Nm -listens for connection. +listens for connections. Default is 3080. .It Fl R Ar rcvbuf Size of receive buffer to use. @@ -74,7 +74,7 @@ Default is 131072 (128kB). Size of send buffer to use. Default is 131072 (128kB). .It Fl v -Do not fork, run in foreground and print debug informations on standard +Do not fork, run in foreground and print debug information on standard output. .It Ar "exports file" An alternate location for the exports file. diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8 index 37e11cd8b2d6..f2eea7cf3fd5 100644 --- a/sbin/ggate/ggatel/ggatel.8 +++ b/sbin/ggate/ggatel/ggatel.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 9, 2015 +.Dd July 14, 2015 .Dt GGATEL 8 .Os .Sh NAME @@ -62,7 +62,7 @@ It can be used as a replacement for devices or as a .Dq GEOMificator for non GEOM-aware devices, but it was mainly created as an example -on how to use and how to communicate with the GEOM Gate kernel module. +on how to use and how to communicate with the GEOM Gate kernel subsystem. .Pp Available commands: .Bl -tag -width ".Cm destroy" @@ -82,7 +82,8 @@ providers. Take over a previously created provider and handle pending and future requests. This is useful if the initial .Nm -process died. To prevent data loss, the given path must lead to the +process died. +To prevent data loss, the given path must lead to the regular file or device that was used to create the provider. .El .Pp @@ -93,7 +94,7 @@ Forcibly destroy .Nm ggate provider (cancels all pending requests). .It Fl o Cm ro | wo | rw -Specify permission to use when opening the file or device: read-only +Specify permissions to use when opening the file or device: read-only .Pq Cm ro , write-only .Pq Cm wo , @@ -105,7 +106,7 @@ Default is Sector size for .Nm ggate provider. -If not specified, it is taken from device, or set to 512 bytes for files. +If not specified, it is taken from the device, or set to 512 bytes for files. .It Fl t Ar timeout Number of seconds to wait before an I/O request will be canceled. 0 means no timeout. @@ -131,7 +132,7 @@ the .Dq Li fd0 device and use .Xr gbde 8 -to encrypt data on a floppy. +to encrypt data on a floppy disk. .Bd -literal -offset indent ggatel create -u 5 /dev/fd0 gbde init /dev/ggate5 diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c index abfe7c18e41d..0b89df091d2a 100644 --- a/sbin/ggate/ggatel/ggatel.c +++ b/sbin/ggate/ggatel/ggatel.c @@ -173,6 +173,7 @@ g_gatel_create(void) fd = open(path, g_gate_openflags(flags) | O_DIRECT | O_FSYNC); if (fd == -1) err(EXIT_FAILURE, "Cannot open %s", path); + memset(&ggioc, 0, sizeof(ggioc)); ggioc.gctl_version = G_GATE_VERSION; ggioc.gctl_unit = unit; ggioc.gctl_mediasize = g_gate_mediasize(fd); diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index dd1aa8bed3e0..7dc4e2ac67fd 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -364,5 +364,5 @@ device vmx # VMware VMXNET3 Ethernet # Netmap provides direct access to TX/RX rings on supported NICs device netmap # netmap(4) support -# The cypto framework is required by IPSEC +# The crypto framework is required by IPSEC device crypto # Required by IPSEC diff --git a/sys/arm64/arm64/intr_machdep.c b/sys/arm64/arm64/intr_machdep.c index 4a69187bfe95..7c383ee606fc 100644 --- a/sys/arm64/arm64/intr_machdep.c +++ b/sys/arm64/arm64/intr_machdep.c @@ -451,8 +451,7 @@ void arm_setup_ipihandler(driver_filter_t *filt, u_int ipi) { - /* ARM64TODO: The hard coded 16 will be fixed with am_intrng */ - arm_setup_intr("ipi", filt, NULL, (void *)((uintptr_t)ipi | 1<<16), ipi + 16, + arm_setup_intr("ipi", filt, NULL, (void *)((uintptr_t)ipi | 1<<16), ipi, INTR_TYPE_MISC | INTR_EXCL, NULL); arm_unmask_ipi(ipi); } @@ -460,7 +459,8 @@ arm_setup_ipihandler(driver_filter_t *filt, u_int ipi) void arm_unmask_ipi(u_int ipi) { - PIC_UNMASK(root_pic, ipi + 16); + + PIC_UNMASK(root_pic, ipi); } void @@ -494,9 +494,6 @@ ipi_cpu(int cpu, u_int ipi) CPU_ZERO(&cpus); CPU_SET(cpu, &cpus); - /* ARM64TODO: This will be fixed with arm_intrng */ - ipi += 16; - CTR2(KTR_SMP, "ipi_cpu: cpu: %d, ipi: %x", cpu, ipi); PIC_IPI_SEND(root_pic, cpus, ipi); } @@ -505,9 +502,6 @@ void ipi_selected(cpuset_t cpus, u_int ipi) { - /* ARM64TODO: This will be fixed with arm_intrng */ - ipi += 16; - CTR1(KTR_SMP, "ipi_selected: ipi: %x", ipi); PIC_IPI_SEND(root_pic, cpus, ipi); } diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index be7f0c710d6c..64e11d899c3a 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -469,6 +469,9 @@ build_block_pagetable: lsl x12, x7, #2 orr x12, x12, #L2_BLOCK orr x12, x12, #(ATTR_AF) +#ifdef SMP + orr x12, x12, ATTR_SH(ATTR_SH_IS) +#endif /* Only use the output address bits */ lsr x9, x9, #L2_SHIFT diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 15aa290bdad4..860bb6fc78de 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -229,6 +229,9 @@ init_secondary(uint64_t cpu) pcpup->pc_curthread = pcpup->pc_idlethread; pcpup->pc_curpcb = pcpup->pc_idlethread->td_pcb; + /* Configure the interrupt controller */ + arm_init_secondary(); + for (i = 0; i < COUNT_IPI; i++) arm_unmask_ipi(i); @@ -239,9 +242,6 @@ init_secondary(uint64_t cpu) vfp_init(); #endif - /* Configure the interrupt controller */ - arm_init_secondary(); - /* Enable interrupts */ intr_enable(); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 41c32346a04d..7e4182052bd6 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -428,8 +428,8 @@ pmap_bootstrap_dmap(vm_offset_t l1pt) KASSERT(l1_slot < Ln_ENTRIES, ("Invalid L1 index")); pmap_load_store(&l1[l1_slot], - (pa & ~L1_OFFSET) | ATTR_AF | L1_BLOCK | - ATTR_IDX(CACHED_MEMORY)); + (pa & ~L1_OFFSET) | ATTR_DEFAULT | + ATTR_IDX(CACHED_MEMORY) | L1_BLOCK); } cpu_dcache_wb_range((vm_offset_t)l1, PAGE_SIZE); @@ -860,8 +860,8 @@ pmap_kenter_device(vm_offset_t sva, vm_size_t size, vm_paddr_t pa) while (size != 0) { l3 = pmap_l3(kernel_pmap, va); KASSERT(l3 != NULL, ("Invalid page table, va: 0x%lx", va)); - pmap_load_store(l3, (pa & ~L3_OFFSET) | ATTR_AF | L3_PAGE | - ATTR_IDX(DEVICE_MEMORY)); + pmap_load_store(l3, (pa & ~L3_OFFSET) | ATTR_DEFAULT | + ATTR_IDX(DEVICE_MEMORY) | L3_PAGE); PTE_SYNC(l3); va += PAGE_SIZE; @@ -953,8 +953,8 @@ pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) va = sva; for (i = 0; i < count; i++) { m = ma[i]; - pa = VM_PAGE_TO_PHYS(m) | ATTR_AF | - ATTR_IDX(m->md.pv_memattr) | ATTR_AP(ATTR_AP_RW) | L3_PAGE; + pa = VM_PAGE_TO_PHYS(m) | ATTR_DEFAULT | ATTR_AP(ATTR_AP_RW) | + ATTR_IDX(m->md.pv_memattr) | L3_PAGE; l3 = pmap_l3(kernel_pmap, va); pmap_load_store(l3, pa); PTE_SYNC(l3); @@ -1214,8 +1214,7 @@ _pmap_alloc_l3(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp) l2 = (pd_entry_t *)PHYS_TO_DMAP(*l1 & ~ATTR_MASK); l2 = &l2[ptepindex & Ln_ADDR_MASK]; - pmap_load_store(l2, VM_PAGE_TO_PHYS(m) | ATTR_AF | - ATTR_IDX(CACHED_MEMORY) | L2_TABLE); + pmap_load_store(l2, VM_PAGE_TO_PHYS(m) | L2_TABLE); PTE_SYNC(l2); } @@ -1907,14 +1906,14 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) VM_OBJECT_ASSERT_LOCKED(m->object); pa = VM_PAGE_TO_PHYS(m); - new_l3 = (pt_entry_t)(pa | ATTR_AF | L3_PAGE); + new_l3 = (pt_entry_t)(pa | ATTR_DEFAULT | ATTR_IDX(m->md.pv_memattr) | + L3_PAGE); if ((prot & VM_PROT_WRITE) == 0) new_l3 |= ATTR_AP(ATTR_AP_RO); if ((flags & PMAP_ENTER_WIRED) != 0) new_l3 |= ATTR_SW_WIRED; if ((va >> 63) == 0) new_l3 |= ATTR_AP(ATTR_AP_USER); - new_l3 |= ATTR_IDX(m->md.pv_memattr); CTR2(KTR_PMAP, "pmap_enter: %.16lx -> %.16lx", va, pa); @@ -2243,7 +2242,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, */ pmap_resident_count_inc(pmap, 1); - pa = VM_PAGE_TO_PHYS(m) | ATTR_AF | ATTR_IDX(m->md.pv_memattr) | + pa = VM_PAGE_TO_PHYS(m) | ATTR_DEFAULT | ATTR_IDX(m->md.pv_memattr) | ATTR_AP(ATTR_AP_RW) | L3_PAGE; /* diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 1bd12b88cfd1..c4ef49d180b3 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -112,5 +112,5 @@ device bpf # Berkeley packet filter options FDT device acpi -# The cypto framework is required by IPSEC +# The crypto framework is required by IPSEC device crypto # Required by IPSEC diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h index 2b694a6d9068..645cf3154226 100644 --- a/sys/arm64/include/pte.h +++ b/sys/arm64/include/pte.h @@ -63,6 +63,12 @@ typedef uint64_t pt_entry_t; /* page table entry */ #define ATTR_IDX(x) ((x) << 2) #define ATTR_IDX_MASK (7 << 2) +#ifdef SMP +#define ATTR_DEFAULT (ATTR_AF | ATTR_SH(ATTR_SH_IS)) +#else +#define ATTR_DEFAULT (ATTR_AF) +#endif + #define ATTR_DESCR_MASK 3 /* Level 0 table, 512GiB per entry */ diff --git a/sys/compat/cloudabi/cloudabi_proc.c b/sys/compat/cloudabi/cloudabi_proc.c index 6230be24bc4b..0eecae59a548 100644 --- a/sys/compat/cloudabi/cloudabi_proc.c +++ b/sys/compat/cloudabi/cloudabi_proc.c @@ -27,9 +27,10 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include -#include -#include +#include #include @@ -92,21 +93,22 @@ cloudabi_sys_proc_raise(struct thread *td, [CLOUDABI_SIGXCPU] = SIGXCPU, [CLOUDABI_SIGXFSZ] = SIGXFSZ, }; - static const struct sigaction sigdfl = { - .sa_handler = SIG_DFL, - }; - struct kill_args kill_args = { - .pid = td->td_proc->p_pid, - }; + ksiginfo_t ksi; + struct proc *p; - if (uap->sig >= nitems(signals) || - (uap->sig != 0 && signals[uap->sig] == 0)) { - /* Invalid signal. */ - return (EINVAL); + if (uap->sig >= nitems(signals) || signals[uap->sig] == 0) { + /* Invalid signal, or the null signal. */ + return (uap->sig == 0 ? 0 : EINVAL); } - kill_args.signum = signals[uap->sig]; - /* Restore to default signal action and send signal. */ - kern_sigaction(td, kill_args.signum, &sigdfl, NULL, 0); - return (sys_kill(td, &kill_args)); + p = td->td_proc; + ksiginfo_init(&ksi); + ksi.ksi_signo = signals[uap->sig]; + ksi.ksi_code = SI_USER; + ksi.ksi_pid = p->p_pid; + ksi.ksi_uid = td->td_ucred->cr_ruid; + PROC_LOCK(p); + pksignal(p, ksi.ksi_signo, &ksi); + PROC_UNLOCK(p); + return (0); } diff --git a/sys/compat/cloudabi/cloudabi_thread.c b/sys/compat/cloudabi/cloudabi_thread.c index 051d420cd336..4b9eb54b57e5 100644 --- a/sys/compat/cloudabi/cloudabi_thread.c +++ b/sys/compat/cloudabi/cloudabi_thread.c @@ -26,6 +26,10 @@ #include __FBSDID("$FreeBSD$"); +#include +#include +#include + #include int @@ -37,11 +41,19 @@ cloudabi_sys_thread_exit(struct thread *td, return (ENOSYS); } +int +cloudabi_sys_thread_tcb_set(struct thread *td, + struct cloudabi_sys_thread_tcb_set_args *uap) +{ + + return (cpu_set_user_tls(td, uap->tcb)); +} + int cloudabi_sys_thread_yield(struct thread *td, struct cloudabi_sys_thread_yield_args *uap) { - /* Not implemented. */ - return (ENOSYS); + sched_relinquish(td); + return (0); } diff --git a/sys/compat/cloudabi64/cloudabi64_fd.c b/sys/compat/cloudabi64/cloudabi64_fd.c index bbe236ae835c..b2fd67d8aaf8 100644 --- a/sys/compat/cloudabi64/cloudabi64_fd.c +++ b/sys/compat/cloudabi64/cloudabi64_fd.c @@ -26,41 +26,120 @@ #include __FBSDID("$FreeBSD$"); +#include +#include +#include +#include +#include +#include +#include + #include #include +/* Copies in 64-bit iovec structures from userspace. */ +static int +cloudabi64_copyinuio(const cloudabi64_iovec_t *iovp, size_t iovcnt, + struct uio **uiop) +{ + cloudabi64_iovec_t iovobj; + struct uio *uio; + struct iovec *iov; + size_t i; + int error; + + /* Allocate uio and iovecs. */ + if (iovcnt > UIO_MAXIOV) + return (EINVAL); + uio = malloc(sizeof(struct uio) + iovcnt * sizeof(struct iovec), + M_IOV, M_WAITOK); + iov = (struct iovec *)(uio + 1); + + /* Initialize uio. */ + uio->uio_iov = iov; + uio->uio_iovcnt = iovcnt; + uio->uio_segflg = UIO_USERSPACE; + uio->uio_offset = -1; + uio->uio_resid = 0; + + /* Copy in iovecs. */ + for (i = 0; i < iovcnt; i++) { + error = copyin(&iovp[i], &iovobj, sizeof(iovobj)); + if (error != 0) { + free(uio, M_IOV); + return (error); + } + iov[i].iov_base = (void *)iovobj.iov_base; + iov[i].iov_len = iovobj.iov_len; + if (iov[i].iov_len > SSIZE_MAX - uio->uio_resid) { + free(uio, M_IOV); + return (EINVAL); + } + uio->uio_resid += iov[i].iov_len; + } + + *uiop = uio; + return (0); +} + int cloudabi64_sys_fd_pread(struct thread *td, struct cloudabi64_sys_fd_pread_args *uap) { + struct uio *uio; + int error; - /* Not implemented. */ - return (ENOSYS); + error = cloudabi64_copyinuio(uap->iov, uap->iovcnt, &uio); + if (error != 0) + return (error); + error = kern_preadv(td, uap->fd, uio, uap->offset); + free(uio, M_IOV); + return (error); } int cloudabi64_sys_fd_pwrite(struct thread *td, struct cloudabi64_sys_fd_pwrite_args *uap) { + struct uio *uio; + int error; - /* Not implemented. */ - return (ENOSYS); + error = cloudabi64_copyinuio((const cloudabi64_iovec_t *)uap->iov, + uap->iovcnt, &uio); + if (error != 0) + return (error); + error = kern_pwritev(td, uap->fd, uio, uap->offset); + free(uio, M_IOV); + return (error); } int cloudabi64_sys_fd_read(struct thread *td, struct cloudabi64_sys_fd_read_args *uap) { + struct uio *uio; + int error; - /* Not implemented. */ - return (ENOSYS); + error = cloudabi64_copyinuio(uap->iov, uap->iovcnt, &uio); + if (error != 0) + return (error); + error = kern_readv(td, uap->fd, uio); + free(uio, M_IOV); + return (error); } int cloudabi64_sys_fd_write(struct thread *td, struct cloudabi64_sys_fd_write_args *uap) { + struct uio *uio; + int error; - /* Not implemented. */ - return (ENOSYS); + error = cloudabi64_copyinuio((const cloudabi64_iovec_t *)uap->iov, + uap->iovcnt, &uio); + if (error != 0) + return (error); + error = kern_writev(td, uap->fd, uio); + free(uio, M_IOV); + return (error); } diff --git a/sys/compat/cloudabi64/cloudabi64_proto.h b/sys/compat/cloudabi64/cloudabi64_proto.h index 9d33b7c938c9..0eaab8023fc9 100644 --- a/sys/compat/cloudabi64/cloudabi64_proto.h +++ b/sys/compat/cloudabi64/cloudabi64_proto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed + * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed */ #ifndef _CLOUDABI64_SYSPROTO_H_ @@ -301,7 +301,7 @@ struct cloudabi64_sys_thread_create_args { struct cloudabi_sys_thread_exit_args { char lock_l_[PADL_(cloudabi_lock_t *)]; cloudabi_lock_t * lock; char lock_r_[PADR_(cloudabi_lock_t *)]; }; -struct cloudabi64_sys_thread_tcb_set_args { +struct cloudabi_sys_thread_tcb_set_args { char tcb_l_[PADL_(void *)]; void * tcb; char tcb_r_[PADR_(void *)]; }; struct cloudabi_sys_thread_yield_args { @@ -362,7 +362,7 @@ int cloudabi_sys_sock_shutdown(struct thread *, struct cloudabi_sys_sock_shutdow int cloudabi_sys_sock_stat_get(struct thread *, struct cloudabi_sys_sock_stat_get_args *); int cloudabi64_sys_thread_create(struct thread *, struct cloudabi64_sys_thread_create_args *); int cloudabi_sys_thread_exit(struct thread *, struct cloudabi_sys_thread_exit_args *); -int cloudabi64_sys_thread_tcb_set(struct thread *, struct cloudabi64_sys_thread_tcb_set_args *); +int cloudabi_sys_thread_tcb_set(struct thread *, struct cloudabi_sys_thread_tcb_set_args *); int cloudabi_sys_thread_yield(struct thread *, struct cloudabi_sys_thread_yield_args *); #ifdef COMPAT_43 @@ -443,7 +443,7 @@ int cloudabi_sys_thread_yield(struct thread *, struct cloudabi_sys_thread_yield_ #define CLOUDABI64_SYS_AUE_cloudabi_sys_sock_stat_get AUE_NULL #define CLOUDABI64_SYS_AUE_cloudabi64_sys_thread_create AUE_NULL #define CLOUDABI64_SYS_AUE_cloudabi_sys_thread_exit AUE_NULL -#define CLOUDABI64_SYS_AUE_cloudabi64_sys_thread_tcb_set AUE_NULL +#define CLOUDABI64_SYS_AUE_cloudabi_sys_thread_tcb_set AUE_NULL #define CLOUDABI64_SYS_AUE_cloudabi_sys_thread_yield AUE_NULL #undef PAD_ diff --git a/sys/compat/cloudabi64/cloudabi64_syscall.h b/sys/compat/cloudabi64/cloudabi64_syscall.h index 2904a9f0c25c..5d75eea0dc30 100644 --- a/sys/compat/cloudabi64/cloudabi64_syscall.h +++ b/sys/compat/cloudabi64/cloudabi64_syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed + * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed */ #define CLOUDABI64_SYS_cloudabi_sys_clock_res_get 0 @@ -61,6 +61,6 @@ #define CLOUDABI64_SYS_cloudabi_sys_sock_stat_get 52 #define CLOUDABI64_SYS_cloudabi64_sys_thread_create 53 #define CLOUDABI64_SYS_cloudabi_sys_thread_exit 54 -#define CLOUDABI64_SYS_cloudabi64_sys_thread_tcb_set 55 +#define CLOUDABI64_SYS_cloudabi_sys_thread_tcb_set 55 #define CLOUDABI64_SYS_cloudabi_sys_thread_yield 56 #define CLOUDABI64_SYS_MAXSYSCALL 57 diff --git a/sys/compat/cloudabi64/cloudabi64_syscalls.c b/sys/compat/cloudabi64/cloudabi64_syscalls.c index f8fe811fb48d..b0895408343d 100644 --- a/sys/compat/cloudabi64/cloudabi64_syscalls.c +++ b/sys/compat/cloudabi64/cloudabi64_syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed + * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed */ const char *cloudabi64_syscallnames[] = { @@ -62,6 +62,6 @@ const char *cloudabi64_syscallnames[] = { "cloudabi_sys_sock_stat_get", /* 52 = cloudabi_sys_sock_stat_get */ "cloudabi64_sys_thread_create", /* 53 = cloudabi64_sys_thread_create */ "cloudabi_sys_thread_exit", /* 54 = cloudabi_sys_thread_exit */ - "cloudabi64_sys_thread_tcb_set", /* 55 = cloudabi64_sys_thread_tcb_set */ + "cloudabi_sys_thread_tcb_set", /* 55 = cloudabi_sys_thread_tcb_set */ "cloudabi_sys_thread_yield", /* 56 = cloudabi_sys_thread_yield */ }; diff --git a/sys/compat/cloudabi64/cloudabi64_sysent.c b/sys/compat/cloudabi64/cloudabi64_sysent.c index ccfb95be30ae..aaad2c94c405 100644 --- a/sys/compat/cloudabi64/cloudabi64_sysent.c +++ b/sys/compat/cloudabi64/cloudabi64_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed + * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed */ #include @@ -70,6 +70,6 @@ struct sysent cloudabi64_sysent[] = { { AS(cloudabi_sys_sock_stat_get_args), (sy_call_t *)cloudabi_sys_sock_stat_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 52 = cloudabi_sys_sock_stat_get */ { AS(cloudabi64_sys_thread_create_args), (sy_call_t *)cloudabi64_sys_thread_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 53 = cloudabi64_sys_thread_create */ { AS(cloudabi_sys_thread_exit_args), (sy_call_t *)cloudabi_sys_thread_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 54 = cloudabi_sys_thread_exit */ - { AS(cloudabi64_sys_thread_tcb_set_args), (sy_call_t *)cloudabi64_sys_thread_tcb_set, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 55 = cloudabi64_sys_thread_tcb_set */ + { AS(cloudabi_sys_thread_tcb_set_args), (sy_call_t *)cloudabi_sys_thread_tcb_set, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 55 = cloudabi_sys_thread_tcb_set */ { 0, (sy_call_t *)cloudabi_sys_thread_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 56 = cloudabi_sys_thread_yield */ }; diff --git a/sys/compat/cloudabi64/cloudabi64_systrace_args.c b/sys/compat/cloudabi64/cloudabi64_systrace_args.c index 0084cad83d51..df019b2ef86f 100644 --- a/sys/compat/cloudabi64/cloudabi64_systrace_args.c +++ b/sys/compat/cloudabi64/cloudabi64_systrace_args.c @@ -496,9 +496,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } - /* cloudabi64_sys_thread_tcb_set */ + /* cloudabi_sys_thread_tcb_set */ case 55: { - struct cloudabi64_sys_thread_tcb_set_args *p = params; + struct cloudabi_sys_thread_tcb_set_args *p = params; uarg[0] = (intptr_t) p->tcb; /* void * */ *n_args = 1; break; @@ -1367,7 +1367,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* cloudabi64_sys_thread_tcb_set */ + /* cloudabi_sys_thread_tcb_set */ case 55: switch(ndx) { case 0: @@ -1663,7 +1663,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "void"; break; - /* cloudabi64_sys_thread_tcb_set */ + /* cloudabi_sys_thread_tcb_set */ case 55: if (ndx == 0 || ndx == 1) p = "void"; diff --git a/sys/compat/cloudabi64/cloudabi64_thread.c b/sys/compat/cloudabi64/cloudabi64_thread.c index a77d6e226d02..ca26c900c26d 100644 --- a/sys/compat/cloudabi64/cloudabi64_thread.c +++ b/sys/compat/cloudabi64/cloudabi64_thread.c @@ -37,12 +37,3 @@ cloudabi64_sys_thread_create(struct thread *td, /* Not implemented. */ return (ENOSYS); } - -int -cloudabi64_sys_thread_tcb_set(struct thread *td, - struct cloudabi64_sys_thread_tcb_set_args *uap) -{ - - /* Not implemented. */ - return (ENOSYS); -} diff --git a/sys/compat/cloudabi64/syscalls.master b/sys/compat/cloudabi64/syscalls.master index 42a74ca71d7c..d2c797a08c40 100644 --- a/sys/compat/cloudabi64/syscalls.master +++ b/sys/compat/cloudabi64/syscalls.master @@ -207,6 +207,5 @@ cloudabi64_threadattr_t *attr); } 54 AUE_NULL STD { void cloudabi_sys_thread_exit( \ cloudabi_lock_t *lock); } -55 AUE_NULL STD { void cloudabi64_sys_thread_tcb_set( \ - void *tcb); } +55 AUE_NULL STD { void cloudabi_sys_thread_tcb_set(void *tcb); } 56 AUE_NULL STD { void cloudabi_sys_thread_yield(); } diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index cc2b56fd00ef..3f06e767faa8 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -379,5 +379,5 @@ device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet -# The cypto framework is required by IPSEC +# The crypto framework is required by IPSEC device crypto # Required by IPSEC diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 8646a0e5bf40..e7876ba8cdd8 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -257,5 +257,5 @@ device bpf # Berkeley packet filter #device "snd_sb16" # Sound Blaster 16 #device snd_sbc # Sound Blaster -# The cypto framework is required by IPSEC +# The crypto framework is required by IPSEC device crypto # Required by IPSEC diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 37cafbc666f6..e2ed7876f452 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -217,5 +217,5 @@ device snd_ai2s # Apple I2S audio device snd_davbus # Apple DAVBUS audio device snd_uaudio # USB Audio -# The cypto framework is required by IPSEC +# The crypto framework is required by IPSEC device crypto # Required by IPSEC diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 04df77db69b7..0038c66e48cd 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -251,5 +251,5 @@ device snd_audiocs # Crystal Semiconductor CS4231 device snd_es137x # Ensoniq AudioPCI ES137x device snd_t4dwave # Acer Labs M5451 -# The cypto framework is required by IPSEC +# The crypto framework is required by IPSEC device crypto # Required by IPSEC diff --git a/tools/regression/lib/libc/nss/test-getaddr.c b/tools/regression/lib/libc/nss/test-getaddr.c index 309c94b1c242..aae1605f6860 100644 --- a/tools/regression/lib/libc/nss/test-getaddr.c +++ b/tools/regression/lib/libc/nss/test-getaddr.c @@ -448,6 +448,7 @@ main(int argc, char **argv) switch (c) { case '4': hints.ai_family = PF_INET; + break; case '6': hints.ai_family = PF_INET6; break;