diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 43d9c36c789e..17d114c96677 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -1,589 +1,588 @@
 FBSD_1.0 {
 	__xuname;
 	pthread_atfork;
 	pthread_attr_destroy;
 	pthread_attr_get_np;
 	pthread_attr_getdetachstate;
 	pthread_attr_getguardsize;
 	pthread_attr_getinheritsched;
 	pthread_attr_getschedparam;
 	pthread_attr_getschedpolicy;
 	pthread_attr_getscope;
 	pthread_attr_getstackaddr;
 	pthread_attr_getstacksize;
 	pthread_attr_init;
 	pthread_attr_setdetachstate;
 	pthread_attr_setguardsize;
 	pthread_attr_setinheritsched;
 	pthread_attr_setschedparam;
 	pthread_attr_setschedpolicy;
 	pthread_attr_setscope;
 	pthread_attr_setstackaddr;
 	pthread_attr_setstacksize;
 	pthread_cancel;
 	pthread_cleanup_pop;
 	pthread_cleanup_push;
 	pthread_cond_broadcast;
 	pthread_cond_destroy;
 	pthread_cond_init;
 	pthread_cond_signal;
 	pthread_cond_timedwait;
 	pthread_cond_wait;
 	pthread_detach;
 	pthread_equal;
 	pthread_exit;
 	pthread_getspecific;
 	pthread_join;
 	pthread_key_create;
 	pthread_key_delete;
 	pthread_kill;
 	pthread_main_np;
 	pthread_mutex_destroy;
 	pthread_mutex_init;
 	pthread_mutex_lock;
 	pthread_mutex_trylock;
 	pthread_mutex_unlock;
 	pthread_mutexattr_destroy;
 	pthread_mutexattr_init;
 	pthread_mutexattr_settype;
 	pthread_once;
 	pthread_rwlock_destroy;
 	pthread_rwlock_init;
 	pthread_rwlock_rdlock;
 	pthread_rwlock_tryrdlock;
 	pthread_rwlock_trywrlock;
 	pthread_rwlock_unlock;
 	pthread_rwlock_wrlock;
 	pthread_self;
 	pthread_setcancelstate;
 	pthread_setcanceltype;
 	pthread_setspecific;
 	pthread_sigmask;
 	pthread_testcancel;
 	alarm;
 	arc4random;
 	__assert;
 	check_utility_compat;
 	clock;
 	closedir;
 	confstr;
 	ctermid;
 	ctermid_r;
 	daemon;
 	getdiskbyname;
 	dladdr;
 	dlclose;
 	dlerror;
 	dlfunc;
 	dllockinit;
 	dlopen;
 	dlsym;
 	dlvsym;
 	dlinfo;
 	dl_iterate_phdr;
 	drand48;
 	erand48;
 	err_set_file;
 	err_set_exit;
 	err;
 	verr;
 	errc;
 	verrc;
 	errx;
 	verrx;
 	warn;
 	vwarn;
 	warnc;
 	vwarnc;
 	warnx;
 	vwarnx;
 	sys_errlist;
 	sys_nerr;
 	exect;
 	execl;
 	execle;
 	execlp;
 	execv;
 	execvp;
 	execvP;
 	fabs;
 	fmtcheck;
 	fmtmsg;
 	fnmatch;
 	__fpclassifyf;
 	__fpclassifyd;
 	__fpclassifyl;
 	frexp;
 	setfstab;
 	getfstab;
 	getfsent;
 	getfsspec;
 	getfsfile;
 	setfsent;
 	endfsent;
 	ftok;
 	getbootfile;
 	getbsize;
 	cgetset;
 	cgetcap;
 	cgetent;
 	cgetmatch;
 	cgetfirst;
 	cgetclose;
 	cgetnext;
 	cgetstr;
 	cgetustr;
 	cgetnum;
 	getcwd;
 	getdomainname;
 	setgrent;
 	setgroupent;
 	endgrent;
 	getgrent_r;
 	getgrnam_r;
 	getgrgid_r;
 	getgrnam;
 	getgrgid;
 	getgrent;
 	/*
 	 * Why are __gr_parse_entry() and __gr_match_entry() not static in
 	 * gen/getgrent.c?
 	 */
 	getgrouplist;
 	gethostname;
 	getloadavg;
 	getlogin;
 	setnetgrent;
 	getnetgrent;
 	endnetgrent;
 	innetgr;
 	getosreldate;
 	getpeereid;
 	_getprogname;
 	getprogname;
 	setpwent;
 	setpassent;
 	endpwent;
 	getpwent_r;
 	getpwnam_r;
 	getpwuid_r;
 	getpwnam;
 	getpwuid;
 	getpwent;
 	getttynam;
 	getttyent;
 	setttyent;
 	endttyent;
 	isdialuptty;
 	isnettty;
 	getusershell;
 	endusershell;
 	setusershell;
 	getvfsbyname;
 	__nan;
 	__isnan;
 	isnan;
 	__isnanf;
 	isnanf;
 	__infinity;
 	__isinf;
 	isinf;
 	__isinff;
 	__isinfl;
 	isatty;
 	initgroups;
 	jrand48;
 	lcong48;
 	ldexp;
 	lockf;
 	lrand48;
 	makecontext;
 	modf;
 	mrand48;
 	nice;
 	nlist;
 	nrand48;
 	opendir;
 	pause;
 	posix_madvise;
 	popen;
 	pclose;
 	psignal;
 	raise;
 	readpassphrase;
 	getpass;
 	rewinddir;
 	seed48;
 	seekdir;
 	user_from_uid;
 	group_from_gid;
 	setdomainname;
 	sethostname;
 	_setjmp;
 	_longjmp;
 	setjmp;
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
 	longjmperror;
 	getmode;
 	setmode;
 	setproctitle;
 	setprogname;
 	siginterrupt;
 	sys_signame;
 	sys_siglist;
 	sys_nsig;
 	signal;
 	sigaddset;
 	sigdelset;
 	sigemptyset;
 	sigfillset;
 	sigismember;
 	sleep;
 	srand48;
 	fstatvfs;
 	statvfs;
 	sl_init;
 	sl_add;
 	sl_free;
 	sl_find;
 	fflagstostr;
 	strtofflags;
 	sysconf;
 	sysctl;
 	sysctlbyname;
 	sysctlnametomib;
 	syslog;
 	vsyslog;
 	openlog;
 	closelog;
 	setlogmask;
 	ttyname_r;
 	ttyname;
 	times;
 	time;
 	telldir;
 	tcgetattr;
 	tcsetattr;
 	tcsetpgrp;
 	tcgetpgrp;
 	cfgetospeed;
 	cfgetispeed;
 	cfsetospeed;
 	cfsetispeed;
 	cfsetspeed;
 	cfmakeraw;
 	tcsendbreak;
 	_init_tls;
 	__tls_get_addr;
 	tcdrain;
 	tcflush;
 	tcflow;
 	ualarm;
 	ulimit;
 	uname;
 	strunvis;
 	strunvisx;
 	usleep;
 	utime;
 	valloc;
 	vis;
 	strvis;
 	strvisx;
 	wait;
 	wait3;
 	waitpid;
 	wordexp;
 	wordfree;
 };
 
 FBSD_1.1 {
 	arc4random_buf;
 	arc4random_uniform;
 	fdevname;
 	fdevname_r;
 	fdopendir;
 	feature_present;
 	posix_spawn;
 	posix_spawn_file_actions_addclose;
 	posix_spawn_file_actions_adddup2;
 	posix_spawn_file_actions_addopen;
 	posix_spawn_file_actions_destroy;
 	posix_spawn_file_actions_init;
 	posix_spawnattr_destroy;
 	posix_spawnattr_getflags;
 	posix_spawnattr_getpgroup;
 	posix_spawnattr_getschedparam;
 	posix_spawnattr_getschedpolicy;
 	posix_spawnattr_getsigdefault;
 	posix_spawnattr_getsigmask;
 	posix_spawnattr_init;
 	posix_spawnattr_setflags;
 	posix_spawnattr_setpgroup;
 	posix_spawnattr_setschedparam;
 	posix_spawnattr_setschedpolicy;
 	posix_spawnattr_setsigdefault;
 	posix_spawnattr_setsigmask;
 	posix_spawnp;
 	semctl;
 	tcgetsid;
 	tcsetsid;
 	__pthread_cleanup_pop_imp;
 	__pthread_cleanup_push_imp;
 };
 
 FBSD_1.2 {
 	cfmakesane;
 	endutxent;
 	getutxent;
 	getutxid;
 	getutxline;
 	getutxuser;
 	pthread_getthreadid_np;
 	pututxline;
 	sem_close;
 	sem_destroy;
 	sem_getvalue;
 	sem_init;
 	sem_open;
 	sem_post;
 	sem_timedwait;
 	sem_trywait;
 	sem_unlink;
 	sem_wait;
 	setutxdb;
 	setutxent;
 };
 
 FBSD_1.3 {
 	cap_sandboxed;
 	clock_getcpuclockid;
 	dirfd;
 	dup3;
 	fdclosedir;
 	fdlopen;
 	__FreeBSD_libc_enter_restricted_mode;
 	getcontextx;
 	gid_from_group;
 	nvis;
 	pwcache_userdb;
 	pwcache_groupdb;
 	snvis;
 	strenvisx;
 	strnunvis;
 	strnunvisx;
 	strnvis;
 	strnvisx;
 	strsenvisx;
 	strsnvis;
 	strsnvisx;
 	strsvis;
 	strsvisx;
 	svis;
 	uid_from_user;
 	unvis;
 	waitid;
 };
 
 FBSD_1.4 {
 	getnetgrent_r;
 	pthread_mutex_consistent;
 	pthread_mutexattr_getrobust;
 	pthread_mutexattr_setrobust;
 	stravis;
 };
 
 FBSD_1.5 {
 	alphasort;
 	basename;
 	daemonfd;
 	devname;
 	devname_r;
 	dirname;
 	fts_children;
 	fts_close;
 	fts_get_clientptr;
 	fts_get_stream;
 	fts_open;
 	fts_read;
 	fts_set;
 	fts_set_clientptr;
 	ftw;
 	getentropy;
 	getmntinfo;
 	glob;
 	globfree;
 	nftw;
 	readdir;
 	readdir_r;
 	scandir;
 	sem_clockwait_np;
 	setproctitle_fast;
 	timespec_get;
 };
 
 FBSD_1.6 {
 	eventfd;
 	eventfd_read;
 	eventfd_write;
 	getlogin_r;
 	memalign;
 	memfd_create;
 	pthread_getname_np;
 	scandir_b;
 	sigandset;
 	sigisemptyset;
 	sigorset;
 	tcgetwinsize;
 	tcsetwinsize;
 };
 
 FBSD_1.7 {
 	 kqueue1;
 	 posix_spawn_file_actions_addchdir_np;
 	 posix_spawn_file_actions_addclosefrom_np;
 	 posix_spawn_file_actions_addfchdir_np;
 	 scandirat;
 	 sched_getaffinity;
 	 sched_setaffinity;
-	 sched_getcpu;
 	 versionsort;
 	 __cpuset_alloc;
 	 __cpuset_free;
 };
 
 FBSD_1.8 {
 	aio_read2;
 	aio_write2;
 	execvpe;
 };
 
 FBSDprivate_1.0 {
 	/* needed by thread libraries */
 	__thr_jtable;
 
 	_pthread_atfork;
 	_pthread_attr_destroy;
 	_pthread_attr_getdetachstate;
 	_pthread_attr_getguardsize;
 	_pthread_attr_getinheritsched;
 	_pthread_attr_getschedparam;
 	_pthread_attr_getschedpolicy;
 	_pthread_attr_getscope;
 	_pthread_attr_getstackaddr;
 	_pthread_attr_getstacksize;
 	_pthread_attr_init;
 	_pthread_attr_setdetachstate;
 	_pthread_attr_setguardsize;
 	_pthread_attr_setinheritsched;
 	_pthread_attr_setschedparam;
 	_pthread_attr_setschedpolicy;
 	_pthread_attr_setscope;
 	_pthread_attr_setstackaddr;
 	_pthread_attr_setstacksize;
 	_pthread_cancel;
 	_pthread_cancel_enter;
 	_pthread_cancel_leave;
 	_pthread_cleanup_pop;
 	_pthread_cleanup_push;
 	_pthread_cond_broadcast;
 	_pthread_cond_destroy;
 	_pthread_cond_init;
 	_pthread_cond_signal;
 	_pthread_cond_timedwait;
 	_pthread_cond_wait;
 	_pthread_detach;
 	_pthread_equal;
 	_pthread_exit;
 	_pthread_getspecific;
 	_pthread_join;
 	_pthread_key_create;
 	_pthread_key_delete;
 	_pthread_kill;
 	_pthread_main_np;
 	_pthread_mutex_destroy;
 	_pthread_mutex_init_calloc_cb;
 	_pthread_mutex_init;
 	_pthread_mutex_lock;
 	_pthread_mutex_trylock;
 	_pthread_mutex_unlock;
 	_pthread_mutexattr_destroy;
 	_pthread_mutexattr_init;
 	_pthread_mutexattr_settype;
 	_pthread_once;
 	_pthread_rwlock_destroy;
 	_pthread_rwlock_init;
 	_pthread_rwlock_rdlock;
 	_pthread_rwlock_tryrdlock;
 	_pthread_rwlock_trywrlock;
 	_pthread_rwlock_unlock;
 	_pthread_rwlock_wrlock;
 	_pthread_self;
 	_pthread_setcancelstate;
 	_pthread_setcanceltype;
 	_pthread_setspecific;
 	_pthread_sigmask;
 	_pthread_testcancel;
 	_spinlock;
 	_spinunlock;
 	_rtld_addr_phdr;
 	_rtld_atfork_pre;
 	_rtld_atfork_post;
 	_rtld_error;		/* for private use */
 	_rtld_get_stack_prot;
 	_rtld_is_dlopened;
 	_rtld_thread_init;	/* for private use */
 	__elf_phdr_match_addr;
 	_err;
 	_warn;
 	__fmtcheck;
 	/* __pw_match_entry; */
 	/* __pw_parse_entry; */
 	__fdnlist;	/* used by libkvm */
 	/* __elf_is_okay__; */
 	/* __elf_fdnlist; */
 	__opendir2;
 	__pause;
 	_pause;
 	__raise;
 	_raise;
 	__sleep;
 	_sleep;
 	_rtld_allocate_tls;
 	_rtld_free_tls;
 #if defined(i386)
 	___libc_tls_get_addr;	/* x86 only */
 #endif
 	__libc_tls_get_addr;
 	__tcdrain;
 	_tcdrain;
 	__usleep;
 	_usleep;
 	__wait;
 	_wait;
 	__waitpid;
 	_waitpid;
 
 	__libc_interposing_slot;
 
 	_libc_sem_init_compat;
 	_libc_sem_destroy_compat;
 	_libc_sem_open_compat;
 	_libc_sem_close_compat;
 	_libc_sem_unlink_compat;
 	_libc_sem_wait_compat;
 	_libc_sem_trywait_compat;
 	_libc_sem_timedwait_compat;
 	_libc_sem_post_compat;
 	_libc_sem_getvalue_compat;
 
 	__libc_tcdrain;
 
 	__pthread_distribute_static_tls;
 	__pthread_map_stacks_exec;
 	__fillcontextx;
 	__fillcontextx2;
 	__getcontextx_size;
 	__makecontext;
 };
diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map
index 8d68d23686a8..822c007d32f1 100644
--- a/lib/libsys/Symbol.sys.map
+++ b/lib/libsys/Symbol.sys.map
@@ -1,392 +1,393 @@
 /*
  * It'd be nice to automatically generate the syscall symbols, but we
  * don't know to what version they will eventually belong to, so for now
  * it has to be manual.
  */
 FBSD_1.0 {
 	__acl_aclcheck_fd;
 	__acl_aclcheck_file;
 	__acl_aclcheck_link;
 	__acl_delete_fd;
 	__acl_delete_file;
 	__acl_delete_link;
 	__acl_get_fd;
 	__acl_get_file;
 	__acl_get_link;
 	__acl_set_fd;
 	__acl_set_file;
 	__acl_set_link;
 	__getcwd;
 	__mac_execve;
 	__mac_get_fd;
 	__mac_get_file;
 	__mac_get_link;
 	__mac_get_pid;
 	__mac_get_proc;
 	__mac_set_fd;
 	__mac_set_file;
 	__mac_set_link;
 	__mac_set_proc;
 	__setugid;
 	__syscall;
 	__sysctl;
 	_exit;
 	_umtx_op;
 	abort2;
 	access;
 	acct;
 	adjtime;
 	aio_cancel;
 	aio_error;
 	aio_fsync;
 	aio_read;
 	aio_return;
 	aio_waitcomplete;
 	aio_write;
 	audit;
 	auditctl;
 	auditon;
 	bind;
 	chdir;
 	chflags;
 	chmod;
 	chown;
 	chroot;
 	clock_getres;
 	clock_gettime;
 	clock_settime;
 	dup;
 	dup2;
 	eaccess;
 	execve;
 	extattr_delete_fd;
 	extattr_delete_file;
 	extattr_delete_link;
 	extattr_get_fd;
 	extattr_get_file;
 	extattr_get_link;
 	extattr_list_fd;
 	extattr_list_file;
 	extattr_list_link;
 	extattr_set_fd;
 	extattr_set_file;
 	extattr_set_link;
 	extattrctl;
 	errno;
 	fchdir;
 	fchflags;
 	fchmod;
 	fchown;
 	fhopen;
 	flock;
 	fpathconf;
 	futimes;
 	getaudit;
 	getaudit_addr;
 	getauid;
 	getcontext;
 	getdtablesize;
 	getegid;
 	geteuid;
 	getfh;
 	getgid;
 	getgroups;
 	getitimer;
 	getpagesize;
 	getpeername;
 	getpgid;
 	getpgrp;
 	getpid;
 	getppid;
 	getpriority;
 	getresgid;
 	getresuid;
 	getrlimit;
 	getrusage;
 	getsid;
 	getsockname;
 	getsockopt;
 	gettimeofday;
 	getuid;
 	ioctl;
 	issetugid;
 	jail;
 	jail_attach;
 	kenv;
 	kill;
 	kldfind;
 	kldfirstmod;
 	kldload;
 	kldnext;
 	kldstat;
 	kldsym;
 	kldunload;
 	kldunloadf;
 	kqueue;
 	kmq_notify;		/* Do we want these to be public interfaces? */
 	kmq_open;		/* librt uses them to provide mq_xxx. */
 	kmq_setattr;
 	kmq_timedreceive;
 	kmq_timedsend;
 	kmq_unlink;
 	ksem_close;
 	ksem_destroy;
 	ksem_getvalue;
 	ksem_init;
 	ksem_open;
 	ksem_post;
 	ksem_timedwait;
 	ksem_trywait;
 	ksem_unlink;
 	ksem_wait;
 	ktrace;
 	lchflags;
 	lchmod;
 	lchown;
 	lgetfh;
 	link;
 	lio_listio;
 	listen;
 	lutimes;
 	mac_syscall;
 	madvise;
 	mincore;
 	minherit;
 	mkdir;
 	mkfifo;
 	mlock;
 	mlockall;
 	modfind;
 	modfnext;
 	modnext;
 	modstat;
 	mount;
 	mprotect;
 	msgget;
 	msgrcv;
 	msgsnd;
 	msgsys;
 	munlock;
 	munlockall;
 	munmap;
 	nfssvc;
 	nmount;
 	ntp_adjtime;
 	ntp_gettime;
 	pathconf;
 	posix_openpt;
 	preadv;
 	profil;
 	pwritev;
 	quotactl;
 	readlink;
 	reboot;
 	rename;
 	revoke;
 	rfork;
 	rmdir;
 	rtprio;
 	rtprio_thread;
 	sched_get_priority_max;
 	sched_get_priority_min;
 	sched_getparam;
 	sched_getscheduler;
 	sched_rr_get_interval;
 	sched_setparam;
 	sched_setscheduler;
 	sched_yield;
 	semget;
 	semop;
 	semsys;
 	sendfile;
 	setaudit;
 	setaudit_addr;
 	setauid;
 	setegid;
 	seteuid;
 	setgid;
 	setgroups;
 	setitimer;
 	setlogin;
 	setpgid;
 	setpriority;
 	setregid;
 	setresgid;
 	setresuid;
 	setreuid;
 	setrlimit;
 	setsid;
 	setsockopt;
 	settimeofday;
 	setuid;
 	shm_unlink;
 	shmat;
 	shmdt;
 	shmget;
 	shmsys;
 	shutdown;
 	sigaltstack;
 	sigpending;
 	sigqueue;
 	sigreturn;
 	socket;
 	socketpair;
 	swapon;
 	symlink;
 	sync;
 	sysarch;
 	syscall;
 	thr_create;
 	thr_exit;
 	thr_kill;
 	thr_kill2;
 	thr_new;
 	thr_self;
 	thr_set_name;
 	thr_suspend;
 	thr_wake;
 	ktimer_create;		/* Do we want these to be public interfaces? */
 	ktimer_delete;		/* librt uses them to provide timer_xxx. */
 	ktimer_getoverrun;
 	ktimer_gettime;
 	ktimer_settime;
 	umask;
 	undelete;
 	unlink;
 	unmount;
 	utimes;
 	utrace;
 	uuidgen;
 	vfork;
 
 	__error;
 	ftruncate;
 	lseek;
 	mmap;
 	pread;
 	pwrite;
 	truncate;
 };
 
 FBSD_1.1 {
 	__semctl;
 	cpuset;
 	cpuset_getid;
 	cpuset_setid;
 	cpuset_getaffinity;
 	cpuset_setaffinity;
 	faccessat;
 	fchmodat;
 	fchownat;
 	fexecve;
 	futimesat;
 	jail_get;
 	jail_set;
 	jail_remove;
 	linkat;
 	lpathconf;
 	mkdirat;
 	mkfifoat;
 	msgctl;
 	readlinkat;
 	renameat;
 	setfib;
 	shmctl;
 	symlinkat;
 	unlinkat;
 };
 
 FBSD_1.2 {
 	cap_enter;
 	cap_getmode;
 	getloginclass;
 	getpagesizes;
 	pdgetpid;
 	pdkill;
 	posix_fallocate;
 	rctl_get_racct;
 	rctl_get_rules;
 	rctl_get_limits;
 	rctl_add_rule;
 	rctl_remove_rule;
 	setloginclass;
 };
 
 FBSD_1.3 {
 	aio_mlock;
 	bindat;
 	cap_fcntls_get;
 	cap_fcntls_limit;
 	cap_ioctls_get;
 	cap_ioctls_limit;
 	__cap_rights_get;
 	cap_rights_limit;
 	chflagsat;
 	clock_getcpuclockid2;
 	connectat;
 	ffclock_getcounter;
 	ffclock_getestimate;
 	ffclock_setestimate;
 	pipe2;
 	posix_fadvise;
 	procctl;
 };
 
 FBSD_1.4 {
 	futimens;
 	utimensat;
 };
 
 FBSD_1.5 {
 	elf_aux_info;
 	fhstat;
 	fhstatfs;
 	fstat;
 	fstatat;
 	fstatfs;
 	getdirentries;
 	getfsstat;
 	getrandom;
 	mknodat;
 	statfs;
 	cpuset_getdomain;
 	cpuset_setdomain;
 };
 
 FBSD_1.6 {
 	__sysctlbyname;
 	aio_readv;
 	aio_writev;
 	close_range;
 	copy_file_range;
 	fhlink;
 	fhlinkat;
 	fhreadlink;
 	getfhat;
 	funlinkat;
 	shm_rename;
 };
 
 FBSD_1.7 {
 	fspacectl;
 	kqueuex;
 	membarrier;
+	sched_getcpu;
 	swapoff;
 	timerfd_create;
 	timerfd_gettime;
 	timerfd_settime;
 };
 
 FBSD_1.8 {
 	 kcmp;
 };
 
 FBSDprivate_1.0 {
 	/* Add entries in sort(1) order */
 	__libsys_interposing_slot;
 	__set_error_selector;
 	__sigwait;
 	gssd_syscall;
 	nlm_syscall;
 	rpctls_syscall;
 };