 @@ -1,1450 +1,1453 @@
-/*	$NetBSD: machdep.c,v 1.255.6.1 2017/09/04 20:41:28 snj Exp $	*/
+/*	$NetBSD: machdep.c,v 1.255.6.2 2017/11/30 14:03:41 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Coyote Point Systems, Inc. which was written under contract to Coyote
  * Point by Jed Davis and Devon O'Dell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 2006 Mathieu Ropert <mro@adviseo.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Copyright (c) 2007 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /*-
  * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.255.6.1 2017/09/04 20:41:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.255.6.2 2017/11/30 14:03:41 martin Exp $");
 /* #define XENDEBUG_LOW  */
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_cpureset_delay.h"
 #include "opt_mtrr.h"
 #include "opt_realmem.h"
 #include "opt_xen.h"
 #ifndef XEN
 #include "opt_physmem.h"
 #endif
 #include "isa.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/exec.h>
 #include <sys/exec_aout.h>	/* for MID_* */
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/mount.h>
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/ucontext.h>
 #include <machine/kcore.h>
 #include <sys/ras.h>
 #include <sys/syscallargs.h>
 #include <sys/ksyms.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
 #include <dev/cons.h>
 #include <dev/mm.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 #include <sys/sysctl.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/gdt.h>
 #include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
 #include <machine/bootinfo.h>
 #include <x86/fpu.h>
 #include <x86/dbregs.h>
 #include <machine/mtrr.h>
 #include <machine/mpbiosvar.h>
 #include <x86/cputypes.h>
 #include <x86/cpuvar.h>
 #include <x86/machdep.h>
 #include <x86/x86/tsc.h>
 #include <dev/isa/isareg.h>
 #include <machine/isa_machdep.h>
 #include <dev/ic/i8042reg.h>
 #ifdef XEN
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 #endif
 #ifdef DDB
 #include <machine/db_machdep.h>
 #include <ddb/db_extern.h>
 #include <ddb/db_output.h>
 #include <ddb/db_interface.h>
 #endif
 #include "acpica.h"
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #define ACPI_MACHDEP_PRIVATE
 #include <machine/acpi_machdep.h>
 #else
 #include <machine/i82489var.h>
 #endif
 #include "isa.h"
 #include "isadma.h"
 #include "ksyms.h"
 /* the following is used externally (sysctl_hw) */
 char machine[] = "amd64";		/* CPU "architecture" */
 char machine_arch[] = "x86_64";		/* machine == machine_arch */
 #ifdef CPURESET_DELAY
 int cpureset_delay = CPURESET_DELAY;
 #else
 int cpureset_delay = 2000; /* default to 2s */
 #endif
 int cpu_class = CPUCLASS_686;
 #ifdef MTRR
 struct mtrr_funcs *mtrr_funcs;
 #endif
 uint64_t dumpmem_low;
 uint64_t dumpmem_high;
 int cpu_class;
 int use_pae;
 #ifndef NO_SPARSE_DUMP
 int sparse_dump = 1;
 paddr_t max_paddr = 0;
 unsigned char *sparse_dump_physmap;
 #endif
 char *dump_headerbuf, *dump_headerbuf_ptr;
 #define dump_headerbuf_size PAGE_SIZE
 #define dump_headerbuf_end (dump_headerbuf + dump_headerbuf_size)
 #define dump_headerbuf_avail (dump_headerbuf_end - dump_headerbuf_ptr)
 daddr_t dump_header_blkno;
 size_t dump_nmemsegs;
 size_t dump_npages;
 size_t dump_header_size;
 size_t dump_totalbytesleft;
 vaddr_t idt_vaddr;
 paddr_t idt_paddr;
 vaddr_t gdt_vaddr;
 paddr_t gdt_paddr;
 vaddr_t ldt_vaddr;
 paddr_t ldt_paddr;
 vaddr_t module_start, module_end;
 static struct vm_map module_map_store;
 extern struct vm_map *module_map;
 vaddr_t kern_end;
 struct vm_map *phys_map = NULL;
 extern paddr_t lowmem_rsvd;
 extern paddr_t avail_start, avail_end;
 #ifdef XEN
 extern paddr_t pmap_pa_start, pmap_pa_end;
 #endif
 #ifndef XEN
 void (*delay_func)(unsigned int) = i8254_delay;
 void (*initclock_func)(void) = i8254_initclocks;
 #else /* XEN */
 void (*delay_func)(unsigned int) = xen_delay;
 void (*initclock_func)(void) = xen_initclocks;
 #endif
 struct pool x86_dbregspl;
 /*
  * Size of memory segments, before any memory is stolen.
  */
 phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
 int mem_cluster_cnt;
 char x86_64_doubleflt_stack[4096];
 int cpu_dump(void);
 int cpu_dumpsize(void);
 u_long cpu_dump_mempagecnt(void);
 void dodumpsys(void);
 void dumpsys(void);
 extern int time_adjusted;	/* XXX no common header */
 void dump_misc_init(void);
 void dump_seg_prep(void);
 int dump_seg_iter(int (*)(paddr_t, paddr_t));
 #ifndef NO_SPARSE_DUMP
 void sparse_dump_reset(void);
 void sparse_dump_mark(void);
 void cpu_dump_prep_sparse(void);
 #endif
 void dump_header_start(void);
 int dump_header_flush(void);
 int dump_header_addbytes(const void*, size_t);
 int dump_header_addseg(paddr_t, paddr_t);
 int dump_header_finish(void);
 int dump_seg_count_range(paddr_t, paddr_t);
 int dumpsys_seg(paddr_t, paddr_t);
 void init_x86_64(paddr_t);
 /*
  * Machine-dependent startup code
  */
 void
 cpu_startup(void)
+{
 	int x, y;
 	vaddr_t minaddr, maxaddr;
 	psize_t sz;
 	/*
 	 * For console drivers that require uvm and pmap to be initialized,
 	 * we'll give them one more chance here...
 	 */
 	consinit();
 	/*
 	 * Initialize error message buffer (et end of core).
 	 */
 	if (msgbuf_p_cnt == 0)
 		panic("msgbuf paddr map has not been set up");
 	for (x = 0, sz = 0; x < msgbuf_p_cnt; sz += msgbuf_p_seg[x++].sz)
 		continue;
 	msgbuf_vaddr = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_VAONLY);
 	if (msgbuf_vaddr == 0)
 		panic("failed to valloc msgbuf_vaddr");
 	for (y = 0, sz = 0; y < msgbuf_p_cnt; y++) {
 		for (x = 0; x < btoc(msgbuf_p_seg[y].sz); x++, sz += PAGE_SIZE)
 			pmap_kenter_pa((vaddr_t)msgbuf_vaddr + sz,
 			    msgbuf_p_seg[y].paddr + x * PAGE_SIZE,
 			    VM_PROT_READ|VM_PROT_WRITE, 0);
+	}
 	pmap_update(pmap_kernel());
 	initmsgbuf((void *)msgbuf_vaddr, round_page(sz));
 	minaddr = 0;
 	/*
 	 * Allocate a submap for physio.
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 	    VM_PHYS_SIZE, 0, false, NULL);
 	/*
 	 * Create the module map.
+	 *
 	 * The kernel uses RIP-relative addressing with a maximum offset of
 	 * 2GB. The problem is, kernel_map is too far away in memory from
 	 * the kernel .text. So we cannot use it, and have to create a
 	 * special module_map.
+	 *
 	 * The module map is taken as what is left of the bootstrap memory
 	 * created in locore.S. This memory is right above the kernel
 	 * image, so this is the best place to put our modules.
 	 */
 	uvm_map_setup(&module_map_store, module_start, module_end, 0);
 	module_map_store.pmap = pmap_kernel();
 	module_map = &module_map_store;
 	/* Say hello. */
 	banner();
 #if NISA > 0 || NPCI > 0
 	/* Safe for i/o port / memory space allocation to use malloc now. */
 	x86_bus_space_mallocok();
 #endif
 	gdt_init();
 	x86_64_proc0_tss_ldt_init();
 	cpu_init_tss(&cpu_info_primary);
 #if !defined(XEN)
 	ltr(cpu_info_primary.ci_tss_sel);
 #endif /* !defined(XEN) */
 	x86_startup();
+}
 #ifdef XEN
 /* used in assembly */
 void hypervisor_callback(void);
 void failsafe_callback(void);
 void x86_64_switch_context(struct pcb *);
 void x86_64_tls_switch(struct lwp *);
 void
 x86_64_switch_context(struct pcb *new)
+{
 	HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), new->pcb_rsp0);
 	struct physdev_op physop;
 	physop.cmd = PHYSDEVOP_SET_IOPL;
 	physop.u.set_iopl.iopl = new->pcb_iopl;
 	HYPERVISOR_physdev_op(&physop);
+}
 void
 x86_64_tls_switch(struct lwp *l)
+{
 	struct cpu_info *ci = curcpu();
 	struct pcb *pcb = lwp_getpcb(l);
 	struct trapframe *tf = l->l_md.md_regs;
 	uint64_t zero = 0;
 	/*
 	 * Raise the IPL to IPL_HIGH.
 	 * FPU IPIs can alter the LWP's saved cr0.  Dropping the priority
 	 * is deferred until mi_switch(), when cpu_switchto() returns.
 	 */
 	(void)splhigh();
 	/*
 	 * If our floating point registers are on a different CPU,
 	 * set CR0_TS so we'll trap rather than reuse bogus state.
 	 */
 	if (l != ci->ci_fpcurlwp) {
 		HYPERVISOR_fpu_taskswitch(1);
+	}
 	/* Update TLS segment pointers */
 	if (pcb->pcb_flags & PCB_COMPAT32) {
 		update_descriptor(&curcpu()->ci_gdt[GUFS_SEL], &pcb->pcb_fs);
 		update_descriptor(&curcpu()->ci_gdt[GUGS_SEL], &pcb->pcb_gs);
 		setfs(tf->tf_fs);
 		HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, tf->tf_gs);
 	} else {
 		update_descriptor(&curcpu()->ci_gdt[GUFS_SEL], &zero);
 		update_descriptor(&curcpu()->ci_gdt[GUGS_SEL], &zero);
 		setfs(0);
 		HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, 0);
 		HYPERVISOR_set_segment_base(SEGBASE_FS, pcb->pcb_fs);
 		HYPERVISOR_set_segment_base(SEGBASE_GS_USER, pcb->pcb_gs);
+	}
+}
 #endif /* XEN */
 /*
  * Set up proc0's TSS and LDT.
  */
 void
 x86_64_proc0_tss_ldt_init(void)
+{
 	struct lwp *l = &lwp0;
 	struct pcb *pcb = lwp_getpcb(l);
 	pcb->pcb_flags = 0;
 	pcb->pcb_fs = 0;
 	pcb->pcb_gs = 0;
 	pcb->pcb_rsp0 = (uvm_lwp_getuarea(l) + USPACE - 16) & ~0xf;
 	pcb->pcb_iopl = SEL_KPL;
 	pcb->pcb_dbregs = NULL;
 	pmap_kernel()->pm_ldt_sel = GSYSSEL(GLDT_SEL, SEL_KPL);
 	pcb->pcb_cr0 = rcr0() & ~CR0_TS;
 	l->l_md.md_regs = (struct trapframe *)pcb->pcb_rsp0 - 1;
 #if !defined(XEN)
 	lldt(pmap_kernel()->pm_ldt_sel);
 #else
+	{
 	struct physdev_op physop;
 	xen_set_ldt((vaddr_t) ldtstore, LDT_SIZE >> 3);
 	/* Reset TS bit and set kernel stack for interrupt handlers */
 	HYPERVISOR_fpu_taskswitch(1);
 	HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), pcb->pcb_rsp0);
 	physop.cmd = PHYSDEVOP_SET_IOPL;
 	physop.u.set_iopl.iopl = pcb->pcb_iopl;
 	HYPERVISOR_physdev_op(&physop);
+	}
 #endif /* XEN */
+}
 /*
  * Set up TSS and I/O bitmap.
  */
 void
 cpu_init_tss(struct cpu_info *ci)
+{
 	struct x86_64_tss *tss = &ci->ci_tss;
 	uintptr_t p;
 	tss->tss_iobase = IOMAP_INVALOFF << 16;
 	/* tss->tss_ist[0] is filled by cpu_intr_init */
 	/* double fault */
 	tss->tss_ist[1] = (uint64_t)x86_64_doubleflt_stack + PAGE_SIZE - 16;
 	/* NMI */
 	p = uvm_km_alloc(kernel_map, PAGE_SIZE, 0, UVM_KMF_WIRED);
 	tss->tss_ist[2] = p + PAGE_SIZE - 16;
 	ci->ci_tss_sel = tss_alloc(tss);
+}
 void
 buildcontext(struct lwp *l, void *catcher, void *f)
+{
 	struct trapframe *tf = l->l_md.md_regs;
 	tf->tf_ds = GSEL(GUDATA_SEL, SEL_UPL);
 	tf->tf_es = GSEL(GUDATA_SEL, SEL_UPL);
 	tf->tf_fs = GSEL(GUDATA_SEL, SEL_UPL);
 	tf->tf_gs = GSEL(GUDATA_SEL, SEL_UPL);
 	tf->tf_rip = (uint64_t)catcher;
 	tf->tf_cs = GSEL(GUCODE_SEL, SEL_UPL);
 	tf->tf_rflags &= ~PSL_CLEARSIG;
 	tf->tf_rsp = (uint64_t)f;
 	tf->tf_ss = GSEL(GUDATA_SEL, SEL_UPL);
 	/* Ensure FP state is sane */
 	fpu_save_area_reset(l);
+}
 void
 sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)
+{
 	printf("sendsig_sigcontext: illegal\n");
 	sigexit(curlwp, SIGILL);
+}
 void
 sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
+{
 	struct lwp *l = curlwp;
 	struct proc *p = l->l_proc;
 	struct sigacts *ps = p->p_sigacts;
 	int onstack, error;
 	int sig = ksi->ksi_signo;
 	struct sigframe_siginfo *fp, frame;
 	sig_t catcher = SIGACTION(p, sig).sa_handler;
 	struct trapframe *tf = l->l_md.md_regs;
 	char *sp;
 	KASSERT(mutex_owned(p->p_lock));
 	/* Do we need to jump onto the signal stack? */
 	onstack =
 	    (l->l_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0 &&
 	    (SIGACTION(p, sig).sa_flags & SA_ONSTACK) != 0;
 	/* Allocate space for the signal handler context. */
 	if (onstack)
 		sp = ((char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
 	else
 		/* AMD64 ABI 128-bytes "red zone". */
 		sp = (char *)tf->tf_rsp - 128;
 	sp -= sizeof(struct sigframe_siginfo);
 	/* Round down the stackpointer to a multiple of 16 for the ABI. */
 	fp = (struct sigframe_siginfo *)(((unsigned long)sp & ~15) - 8);
 	frame.sf_ra = (uint64_t)ps->sa_sigdesc[sig].sd_tramp;
 	frame.sf_si._info = ksi->ksi_info;
 	frame.sf_uc.uc_flags = _UC_SIGMASK;
 	frame.sf_uc.uc_sigmask = *mask;
 	frame.sf_uc.uc_link = l->l_ctxlink;
 	frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
 	    ? _UC_SETSTACK : _UC_CLRSTACK;
 	memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
 	sendsig_reset(l, sig);
 	mutex_exit(p->p_lock);
 	cpu_getmcontext(l, &frame.sf_uc.uc_mcontext, &frame.sf_uc.uc_flags);
 	/* Copyout all the fp regs, the signal handler might expect them. */
 	error = copyout(&frame, fp, sizeof frame);
 	mutex_enter(p->p_lock);
 	if (error != 0) {
 		/*
 		 * Process has trashed its stack; give it an illegal
 		 * instruction to halt it in its tracks.
 		 */
 		sigexit(l, SIGILL);
 		/* NOTREACHED */
+	}
 	buildcontext(l, catcher, fp);
 	tf->tf_rdi = sig;
 	tf->tf_rsi = (uint64_t)&fp->sf_si;
 	tf->tf_rdx = tf->tf_r15 = (uint64_t)&fp->sf_uc;
 	/* Remember that we're now on the signal stack. */
 	if (onstack)
 		l->l_sigstk.ss_flags |= SS_ONSTACK;
 	if ((vaddr_t)catcher >= VM_MAXUSER_ADDRESS) {
 		/*
 		 * process has given an invalid address for the
 		 * handler. Stop it, but do not do it before so
 		 * we can return the right info to userland (or in core dump)
 		 */
 		sigexit(l, SIGILL);
 		/* NOTREACHED */
+	}
+}
 struct pcb dumppcb;
 void
 cpu_reboot(int howto, char *bootstr)
+{
 	static bool syncdone = false;
 	int s = IPL_NONE;
 	__USE(s);	/* ugly otherwise */
 	if (cold) {
 		howto |= RB_HALT;
 		goto haltsys;
+	}
 	boothowto = howto;
 	/* i386 maybe_dump() */
 	/*
 	 * If we've panic'd, don't make the situation potentially
 	 * worse by syncing or unmounting the file systems.
 	 */
 	if ((howto & RB_NOSYNC) == 0 && panicstr == NULL) {
 		if (!syncdone) {
 			syncdone = true;
 			/* XXX used to force unmount as well, here */
 			vfs_sync_all(curlwp);
 			/*
 			 * If we've been adjusting the clock, the todr
 			 * will be out of synch; adjust it now.
+			 *
 			 * XXX used to do this after unmounting all
 			 * filesystems with vfs_shutdown().
 			 */
 			if (time_adjusted != 0)
 				resettodr();
+		}
 		while (vfs_unmountall1(curlwp, false, false) ||
 		       config_detach_all(boothowto) ||
 		       vfs_unmount_forceone(curlwp))
 			;	/* do nothing */
 	} else
 		suspendsched();
 	pmf_system_shutdown(boothowto);
 	/* Disable interrupts. */
 	s = splhigh();
 	/* Do a dump if requested. */
 	if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
 		dumpsys();
 haltsys:
 	doshutdownhooks();
         if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
 #if NACPICA > 0
 		if (s != IPL_NONE)
 			splx(s);
 		acpi_enter_sleep_state(ACPI_STATE_S5);
 #endif
 #ifdef XEN
 		HYPERVISOR_shutdown();
 #endif /* XEN */
+	}
 	cpu_broadcast_halt();
 	if (howto & RB_HALT) {
 #if NACPICA > 0
 		acpi_disable();
 #endif
 		printf("\n");
 		printf("The operating system has halted.\n");
 		printf("Please press any key to reboot.\n\n");
 		cnpollc(1);	/* for proper keyboard command handling */
 		if (cngetc() == 0) {
 			/* no console attached, so just hlt */
 			printf("No keyboard - cannot reboot after all.\n");
 			for(;;) {
 				x86_hlt();
+			}
+		}
 		cnpollc(0);
+	}
 	printf("rebooting...\n");
 	if (cpureset_delay > 0)
 		delay(cpureset_delay * 1000);
 	cpu_reset();
 	for(;;) ;
 	/*NOTREACHED*/
+}
 /*
  * XXXfvdl share dumpcode.
  */
 /*
  * Perform assorted dump-related initialization tasks.  Assumes that
  * the maximum physical memory address will not increase afterwards.
  */
 void
 dump_misc_init(void)
+{
 #ifndef NO_SPARSE_DUMP
 	int i;
 #endif
 	if (dump_headerbuf != NULL)
 		return; /* already called */
 #ifndef NO_SPARSE_DUMP
 	for (i = 0; i < mem_cluster_cnt; ++i) {
 		paddr_t top = mem_clusters[i].start + mem_clusters[i].size;
 		if (max_paddr < top)
 			max_paddr = top;
+	}
 #ifdef DEBUG
 	printf("dump_misc_init: max_paddr = 0x%lx\n",
 	    (unsigned long)max_paddr);
 #endif
 	if (max_paddr == 0) {
 		printf("Your machine does not initialize mem_clusters; "
 		    "sparse_dumps disabled\n");
 		sparse_dump = 0;
 	} else {
 		sparse_dump_physmap = (void *)uvm_km_alloc(kernel_map,
 		    roundup(max_paddr / (PAGE_SIZE * NBBY), PAGE_SIZE),
 		    PAGE_SIZE, UVM_KMF_WIRED|UVM_KMF_ZERO);
+	}
 #endif
 	dump_headerbuf = (void *)uvm_km_alloc(kernel_map,
 	    dump_headerbuf_size,
 	    PAGE_SIZE, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	/* XXXjld should check for failure here, disable dumps if so. */
+}
 #ifndef NO_SPARSE_DUMP
 /*
  * Clear the set of pages to include in a sparse dump.
  */
 void
 sparse_dump_reset(void)
+{
 	memset(sparse_dump_physmap, 0,
 	    roundup(max_paddr / (PAGE_SIZE * NBBY), PAGE_SIZE));
+}
 /*
  * Include or exclude pages in a sparse dump.
  */
 void
 sparse_dump_mark(void)
+{
 	paddr_t p, pstart, pend;
 	struct vm_page *pg;
 	int i;
 	uvm_physseg_t upm;
 	/*
 	 * Mark all memory pages, then unmark pages that are uninteresting.
 	 * Dereferenceing pg->uobject might crash again if another CPU
 	 * frees the object out from under us, but we can't lock anything
 	 * so it's a risk we have to take.
 	 */
 	for (i = 0; i < mem_cluster_cnt; ++i) {
 		pstart = mem_clusters[i].start / PAGE_SIZE;
 		pend = pstart + mem_clusters[i].size / PAGE_SIZE;
 		for (p = pstart; p < pend; p++) {
 			setbit(sparse_dump_physmap, p);
+		}
+	}
         for (upm = uvm_physseg_get_first();
 	     uvm_physseg_valid_p(upm);
 	     upm = uvm_physseg_get_next(upm)) {
 		paddr_t pfn;
 		/*
 		 * We assume that seg->start to seg->end are
 		 * uvm_page_physload()ed
 		 */
 		for (pfn = uvm_physseg_get_start(upm);
 		     pfn < uvm_physseg_get_end(upm);
 		     pfn++) {
 			pg = PHYS_TO_VM_PAGE(ptoa(pfn));
 			if (pg->uanon || (pg->pqflags & PQ_FREE) ||
 			    (pg->uobject && pg->uobject->pgops)) {
 				p = VM_PAGE_TO_PHYS(pg) / PAGE_SIZE;
 				clrbit(sparse_dump_physmap, p);
+			}
+		}
+	}
+}
 /*
  * Machine-dependently decides on the contents of a sparse dump, using
  * the above.
  */
 void
 cpu_dump_prep_sparse(void)
+{
 	sparse_dump_reset();
 	/* XXX could the alternate recursive page table be skipped? */
 	sparse_dump_mark();
 	/* Memory for I/O buffers could be unmarked here, for example. */
 	/* The kernel text could also be unmarked, but gdb would be upset. */
+}
 #endif
 /*
  * Abstractly iterate over the collection of memory segments to be
  * dumped; the callback lacks the customary environment-pointer
  * argument because none of the current users really need one.
+ *
  * To be used only after dump_seg_prep is called to set things up.
  */
 int
 dump_seg_iter(int (*callback)(paddr_t, paddr_t))
+{
 	int error, i;
 #define CALLBACK(start,size) do {     \
 	error = callback(start,size); \
 	if (error)                    \
 		return error;         \
 } while(0)
 	for (i = 0; i < mem_cluster_cnt; ++i) {
 #ifndef NO_SPARSE_DUMP
 		/*
 		 * The bitmap is scanned within each memory segment,
 		 * rather than over its entire domain, in case any
 		 * pages outside of the memory proper have been mapped
 		 * into kva; they might be devices that wouldn't
 		 * appreciate being arbitrarily read, and including
 		 * them could also break the assumption that a sparse
 		 * dump will always be smaller than a full one.
 		 */
 		if (sparse_dump && sparse_dump_physmap) {
 			paddr_t p, start, end;
 			int lastset;
 			start = mem_clusters[i].start;
 			end = start + mem_clusters[i].size;
 			start = rounddown(start, PAGE_SIZE); /* unnecessary? */
 			lastset = 0;
 			for (p = start; p < end; p += PAGE_SIZE) {
 				int thisset = isset(sparse_dump_physmap,
 				    p/PAGE_SIZE);
 				if (!lastset && thisset)
 					start = p;
 				if (lastset && !thisset)
 					CALLBACK(start, p - start);
 				lastset = thisset;
+			}
 			if (lastset)
 				CALLBACK(start, p - start);
 		} else
 #endif
 			CALLBACK(mem_clusters[i].start, mem_clusters[i].size);
+	}
 	return 0;
 #undef CALLBACK
+}
 /*
  * Prepare for an impending core dump: decide what's being dumped and
  * how much space it will take up.
  */
 void
 dump_seg_prep(void)
+{
 #ifndef NO_SPARSE_DUMP
 	if (sparse_dump && sparse_dump_physmap)
 		cpu_dump_prep_sparse();
 #endif
 	dump_nmemsegs = 0;
 	dump_npages = 0;
 	dump_seg_iter(dump_seg_count_range);
 	dump_header_size = ALIGN(sizeof(kcore_seg_t)) +
 	    ALIGN(sizeof(cpu_kcore_hdr_t)) +
 	    ALIGN(dump_nmemsegs * sizeof(phys_ram_seg_t));
 	dump_header_size = roundup(dump_header_size, dbtob(1));
 	/*
 	 * savecore(8) will read this to decide how many pages to
 	 * copy, and cpu_dumpconf has already used the pessimistic
 	 * value to set dumplo, so it's time to tell the truth.
 	 */
 	dumpsize = dump_npages; /* XXX could these just be one variable? */
+}
 int
 dump_seg_count_range(paddr_t start, paddr_t size)
+{
 	++dump_nmemsegs;
 	dump_npages += size / PAGE_SIZE;
 	return 0;
+}
 /*
  * A sparse dump's header may be rather large, due to the number of
  * "segments" emitted.  These routines manage a simple output buffer,
  * so that the header can be written to disk incrementally.
  */
 void
 dump_header_start(void)
+{
 	dump_headerbuf_ptr = dump_headerbuf;
 	dump_header_blkno = dumplo;
+}
 int
 dump_header_flush(void)
+{
 	const struct bdevsw *bdev;
 	size_t to_write;
 	int error;
 	bdev = bdevsw_lookup(dumpdev);
 	to_write = roundup(dump_headerbuf_ptr - dump_headerbuf, dbtob(1));
 	error = bdev->d_dump(dumpdev, dump_header_blkno,
 	    dump_headerbuf, to_write);
 	dump_header_blkno += btodb(to_write);
 	dump_headerbuf_ptr = dump_headerbuf;
 	return error;
+}
 int
 dump_header_addbytes(const void* vptr, size_t n)
+{
 	const char* ptr = vptr;
 	int error;
 	while (n > dump_headerbuf_avail) {
 		memcpy(dump_headerbuf_ptr, ptr, dump_headerbuf_avail);
 		ptr += dump_headerbuf_avail;
 		n -= dump_headerbuf_avail;
 		dump_headerbuf_ptr = dump_headerbuf_end;
 		error = dump_header_flush();
 		if (error)
 			return error;
+	}
 	memcpy(dump_headerbuf_ptr, ptr, n);
 	dump_headerbuf_ptr += n;
 	return 0;
+}
 int
 dump_header_addseg(paddr_t start, paddr_t size)
+{
 	phys_ram_seg_t seg = { start, size };
 	return dump_header_addbytes(&seg, sizeof(seg));
+}
 int
 dump_header_finish(void)
+{
 	memset(dump_headerbuf_ptr, 0, dump_headerbuf_avail);
 	return dump_header_flush();
+}
 /*
  * These variables are needed by /sbin/savecore
  */
 uint32_t	dumpmag = 0x8fca0101;	/* magic number */
 int 	dumpsize = 0;		/* pages */
 long	dumplo = 0; 		/* blocks */
 /*
  * cpu_dumpsize: calculate size of machine-dependent kernel core dump headers
  * for a full (non-sparse) dump.
  */
 int
 cpu_dumpsize(void)
+{
 	int size;
 	size = ALIGN(sizeof(kcore_seg_t)) + ALIGN(sizeof(cpu_kcore_hdr_t)) +
 	    ALIGN(mem_cluster_cnt * sizeof(phys_ram_seg_t));
 	if (roundup(size, dbtob(1)) != dbtob(1))
 		return (-1);
 	return (1);
+}
 /*
  * cpu_dump_mempagecnt: calculate the size of RAM (in pages) to be dumped
  * for a full (non-sparse) dump.
  */
 u_long
 cpu_dump_mempagecnt(void)
+{
 	u_long i, n;
 	n = 0;
 	for (i = 0; i < mem_cluster_cnt; i++)
 		n += atop(mem_clusters[i].size);
 	return (n);
+}
 /*
  * cpu_dump: dump the machine-dependent kernel core dump headers.
  */
 int
 cpu_dump(void)
+{
 	kcore_seg_t seg;
 	cpu_kcore_hdr_t cpuhdr;
 	const struct bdevsw *bdev;
 	bdev = bdevsw_lookup(dumpdev);
 	if (bdev == NULL)
 		return (ENXIO);
 	/*
 	 * Generate a segment header.
 	 */
 	CORE_SETMAGIC(seg, KCORE_MAGIC, MID_MACHINE, CORE_CPU);
 	seg.c_size = dump_header_size - ALIGN(sizeof(seg));
 	(void)dump_header_addbytes(&seg, ALIGN(sizeof(seg)));
 	/*
 	 * Add the machine-dependent header info.
 	 */
 	cpuhdr.ptdpaddr = PDPpaddr;
 	cpuhdr.nmemsegs = dump_nmemsegs;
 	(void)dump_header_addbytes(&cpuhdr, ALIGN(sizeof(cpuhdr)));
 	/*
 	 * Write out the memory segment descriptors.
 	 */
 	return dump_seg_iter(dump_header_addseg);
+}
 /*
  * Doadump comes here after turning off memory management and
  * getting on the dump stack, either when called above, or by
  * the auto-restart code.
  */
 #define BYTES_PER_DUMP  PAGE_SIZE /* must be a multiple of pagesize XXX small */
 static vaddr_t dumpspace;
 vaddr_t
 reserve_dumppages(vaddr_t p)
+{
 	dumpspace = p;
 	return (p + BYTES_PER_DUMP);
+}
 int
 dumpsys_seg(paddr_t maddr, paddr_t bytes)
+{
 	u_long i, m, n;
 	daddr_t blkno;
 	const struct bdevsw *bdev;
 	int (*dump)(dev_t, daddr_t, void *, size_t);
 	int error;
 	if (dumpdev == NODEV)
 		return ENODEV;
 	bdev = bdevsw_lookup(dumpdev);
 	if (bdev == NULL || bdev->d_psize == NULL)
 		return ENODEV;
 	dump = bdev->d_dump;
 	blkno = dump_header_blkno;
 	for (i = 0; i < bytes; i += n, dump_totalbytesleft -= n) {
 		/* Print out how many MBs we have left to go. */
 		if ((dump_totalbytesleft % (1024*1024)) == 0)
 			printf_nolog("%lu ", (unsigned long)
 			    (dump_totalbytesleft / (1024 * 1024)));
 		/* Limit size for next transfer. */
 		n = bytes - i;
 		if (n > BYTES_PER_DUMP)
 			n = BYTES_PER_DUMP;
 		for (m = 0; m < n; m += NBPG)
 			pmap_kenter_pa(dumpspace + m, maddr + m,
 			    VM_PROT_READ, 0);
 		pmap_update(pmap_kernel());
 		error = (*dump)(dumpdev, blkno, (void *)dumpspace, n);
 		pmap_kremove_local(dumpspace, n);
 		if (error)
 			return error;
 		maddr += n;
 		blkno += btodb(n);		/* XXX? */
 #if 0	/* XXX this doesn't work.  grr. */
 		/* operator aborting dump? */
 		if (sget() != NULL)
 			return EINTR;
 #endif
+	}
 	dump_header_blkno = blkno;
 	return 0;
+}
 void
 dodumpsys(void)
+{
 	const struct bdevsw *bdev;
 	int dumpend, psize;
 	int error;
 	if (dumpdev == NODEV)
 		return;
 	bdev = bdevsw_lookup(dumpdev);
 	if (bdev == NULL || bdev->d_psize == NULL)
 		return;
 	/*
 	 * For dumps during autoconfiguration,
 	 * if dump device has already configured...
 	 */
 	if (dumpsize == 0)
 		cpu_dumpconf();
 	printf("\ndumping to dev %llu,%llu (offset=%ld, size=%d):",
 	    (unsigned long long)major(dumpdev),
 	    (unsigned long long)minor(dumpdev), dumplo, dumpsize);
 	if (dumplo <= 0 || dumpsize <= 0) {
 		printf(" not possible\n");
 		return;
+	}
 	psize = bdev_size(dumpdev);
 	printf("\ndump ");
 	if (psize == -1) {
 		printf("area unavailable\n");
 		return;
+	}
 #if 0	/* XXX this doesn't work.  grr. */
 	/* toss any characters present prior to dump */
 	while (sget() != NULL); /*syscons and pccons differ */
 #endif
 	dump_seg_prep();
 	dumpend = dumplo + btodb(dump_header_size) + ctod(dump_npages);
 	if (dumpend > psize) {
 		printf("failed: insufficient space (%d < %d)\n",
 		    psize, dumpend);
 		goto failed;
+	}
 	dump_header_start();
 	if ((error = cpu_dump()) != 0)
 		goto err;
 	if ((error = dump_header_finish()) != 0)
 		goto err;
 	if (dump_header_blkno != dumplo + btodb(dump_header_size)) {
 		printf("BAD header size (%ld [written] != %ld [expected])\n",
 		    (long)(dump_header_blkno - dumplo),
 		    (long)btodb(dump_header_size));
 		goto failed;
+	}
 	dump_totalbytesleft = roundup(ptoa(dump_npages), BYTES_PER_DUMP);
 	error = dump_seg_iter(dumpsys_seg);
 	if (error == 0 && dump_header_blkno != dumpend) {
 		printf("BAD dump size (%ld [written] != %ld [expected])\n",
 		    (long)(dumpend - dumplo),
 		    (long)(dump_header_blkno - dumplo));
 		goto failed;
+	}
 err:
 	switch (error) {
 	case ENXIO:
 		printf("device bad\n");
 		break;
 	case EFAULT:
 		printf("device not ready\n");
 		break;
 	case EINVAL:
 		printf("area improper\n");
 		break;
 	case EIO:
 		printf("i/o error\n");
 		break;
 	case EINTR:
 		printf("aborted from console\n");
 		break;
 	case 0:
 		printf("succeeded\n");
 		break;
 	default:
 		printf("error %d\n", error);
 		break;
+	}
 failed:
 	printf("\n\n");
 	delay(5000000);		/* 5 seconds */
+}
 /*
  * This is called by main to set dumplo and dumpsize.
  * Dumps always skip the first PAGE_SIZE of disk space
  * in case there might be a disk label stored there.
  * If there is extra space, put dump at the end to
  * reduce the chance that swapping trashes it.
+ *
  * Sparse dumps can't placed as close to the end as possible, because
  * savecore(8) has to know where to start reading in the dump device
  * before it has access to any of the crashed system's state.
+ *
  * Note also that a sparse dump will never be larger than a full one:
  * in order to add a phys_ram_seg_t to the header, at least one page
  * must be removed.
  */
 void
 cpu_dumpconf(void)
+{
 	int nblks, dumpblks;	/* size of dump area */
 	if (dumpdev == NODEV)
 		goto bad;
 	nblks = bdev_size(dumpdev);
 	if (nblks <= ctod(1))
 		goto bad;
 	dumpblks = cpu_dumpsize();
 	if (dumpblks < 0)
 		goto bad;
 	/* dumpsize is in page units, and doesn't include headers. */
 	dumpsize = cpu_dump_mempagecnt();
 	dumpblks += ctod(dumpsize);
 	/* If dump won't fit (incl. room for possible label), punt. */
 	if (dumpblks > (nblks - ctod(1))) {
 #ifndef NO_SPARSE_DUMP
 		/* A sparse dump might (and hopefully will) fit. */
 		dumplo = ctod(1);
 #else
 		/* But if we're not configured for that, punt. */
 		goto bad;
 #endif
 	} else {
 		/* Put dump at end of partition */
 		dumplo = nblks - dumpblks;
+	}
 	/* Now that we've decided this will work, init ancillary stuff. */
 	dump_misc_init();
 	return;
  bad:
 	dumpsize = 0;
+}
 /*
  * Clear registers on exec
  */
 void
 setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack)
+{
 	struct pcb *pcb = lwp_getpcb(l);
 	struct trapframe *tf;
 #ifdef USER_LDT
 	pmap_ldt_cleanup(l);
 #endif
 	fpu_save_area_clear(l, pack->ep_osversion >= 699002600
 	    ? __NetBSD_NPXCW__ : __NetBSD_COMPAT_NPXCW__);
 	pcb->pcb_flags = 0;
 	if (pcb->pcb_dbregs != NULL) {
 		pool_put(&x86_dbregspl, pcb->pcb_dbregs);
 		pcb->pcb_dbregs = NULL;
+	}
 	l->l_proc->p_flag &= ~PK_32;
 	l->l_md.md_flags = MDL_IRET;
 	tf = l->l_md.md_regs;
 	tf->tf_ds = LSEL(LUDATA_SEL, SEL_UPL);
 	tf->tf_es = LSEL(LUDATA_SEL, SEL_UPL);
 	cpu_fsgs_zero(l);
 	tf->tf_rdi = 0;
 	tf->tf_rsi = 0;
 	tf->tf_rbp = 0;
 	tf->tf_rbx = l->l_proc->p_psstrp;
 	tf->tf_rdx = 0;
 	tf->tf_rcx = 0;
 	tf->tf_rax = 0;
 	tf->tf_rip = pack->ep_entry;
 	tf->tf_cs = LSEL(LUCODE_SEL, SEL_UPL);
 	tf->tf_rflags = PSL_USERSET;
 	tf->tf_rsp = stack;
 	tf->tf_ss = LSEL(LUDATA_SEL, SEL_UPL);
+}
 /*
  * Initialize segments and descriptor tables
  */
 #ifdef XEN
 struct trap_info *xen_idt;
 int xen_idt_idx;
 #endif
 char *ldtstore;
 char *gdtstore;
 void
 setgate(struct gate_descriptor *gd, void *func, int ist, int type, int dpl, int sel)
+{
 	kpreempt_disable();
 	pmap_changeprot_local(idt_vaddr, VM_PROT_READ|VM_PROT_WRITE);
 	gd->gd_looffset = (uint64_t)func & 0xffff;
 	gd->gd_selector = sel;
 	gd->gd_ist = ist;
 	gd->gd_type = type;
 	gd->gd_dpl = dpl;
 	gd->gd_p = 1;
 	gd->gd_hioffset = (uint64_t)func >> 16;
 	gd->gd_zero = 0;
 	gd->gd_xx1 = 0;
 	gd->gd_xx2 = 0;
 	gd->gd_xx3 = 0;
 	pmap_changeprot_local(idt_vaddr, VM_PROT_READ);
 	kpreempt_enable();
+}
 void
 unsetgate(struct gate_descriptor *gd)
+{
 	kpreempt_disable();
 	pmap_changeprot_local(idt_vaddr, VM_PROT_READ|VM_PROT_WRITE);
 	memset(gd, 0, sizeof (*gd));
 	pmap_changeprot_local(idt_vaddr, VM_PROT_READ);
 	kpreempt_enable();
+}
 void
 setregion(struct region_descriptor *rd, void *base, uint16_t limit)
+{
 	rd->rd_limit = limit;
 	rd->rd_base = (uint64_t)base;
+}
 /*
  * Note that the base and limit fields are ignored in long mode.
  */
 void
 set_mem_segment(struct mem_segment_descriptor *sd, void *base, size_t limit,
 	int type, int dpl, int gran, int def32, int is64)
+{
 	sd->sd_lolimit = (unsigned)limit;
 	sd->sd_lobase = (unsigned long)base;
 	sd->sd_type = type;
 	sd->sd_dpl = dpl;
 	sd->sd_p = 1;
 	sd->sd_hilimit = (unsigned)limit >> 16;
 	sd->sd_avl = 0;
 	sd->sd_long = is64;
 	sd->sd_def32 = def32;
 	sd->sd_gran = gran;
 	sd->sd_hibase = (unsigned long)base >> 24;
+}
 void
 set_sys_segment(struct sys_segment_descriptor *sd, void *base, size_t limit,
 	int type, int dpl, int gran)
+{
 	memset(sd, 0, sizeof *sd);
 	sd->sd_lolimit = (unsigned)limit;
 	sd->sd_lobase = (uint64_t)base;
 	sd->sd_type = type;
 	sd->sd_dpl = dpl;
 	sd->sd_p = 1;
 	sd->sd_hilimit = (unsigned)limit >> 16;
 	sd->sd_gran = gran;
 	sd->sd_hibase = (uint64_t)base >> 24;
+}
 void
 cpu_init_idt(void)
+{
 #ifndef XEN
 	struct region_descriptor region;
 	setregion(&region, idt, NIDT * sizeof(idt[0]) - 1);
 	lidt(&region);
 #else
 	if (HYPERVISOR_set_trap_table(xen_idt))
 		panic("HYPERVISOR_set_trap_table() failed");
 #endif
+}