diff options
author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2021-02-13 07:47:38 +0000 |
---|---|---|
committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2021-02-13 07:47:38 +0000 |
commit | f926c1ce4efe9ac7a92e20ae17f53f54e5f7e214 (patch) | |
tree | 828692a105ec6645cfe5923716a5b52440a8607f /sys/arch/amd64 | |
parent | 552a9cd62589903f2bf021e80cfb0c8f768b10af (diff) |
Remove trailing whitespace
No code/functional change
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 12 | ||||
-rw-r--r-- | sys/arch/amd64/amd64/vmm_support.S | 28 |
2 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 1a49c56376e..c6af8207e54 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.271 2020/12/13 06:14:35 gnezdo Exp $ */ +/* $OpenBSD: machdep.c,v 1.272 2021/02/13 07:46:44 mlarkin Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1258,7 +1258,7 @@ void cpu_init_idt(void) struct region_descriptor region; setregion(®ion, idt, NIDT * sizeof(idt[0]) - 1); - lidt(®ion); + lidt(®ion); } void @@ -1463,7 +1463,7 @@ init_x86_64(paddr_t first_avail) * We need to go through the BIOS memory map given, and * fill out mem_clusters and mem_cluster_cnt stuff, taking * into account all the points listed above. - */ + */ avail_end = mem_cluster_cnt = 0; for (bmp = bios_memmap; bmp->type != BIOS_MAP_END; bmp++) { paddr_t s1, s2, e1, e2; @@ -1757,7 +1757,7 @@ cpu_reset(void) * invalid and causing a fault. */ memset((caddr_t)idt, 0, NIDT * sizeof(idt[0])); - __asm volatile("divl %0,%1" : : "q" (0), "a" (0)); + __asm volatile("divl %0,%1" : : "q" (0), "a" (0)); for (;;) continue; @@ -1891,7 +1891,7 @@ splassert_check(int wantipl, const char *func) if (floor > wantipl) { splassert_fail(wantipl, floor, func); } - + } #endif @@ -2031,7 +2031,7 @@ check_context(const struct reg *regs, struct trapframe *tf) return EINVAL; sel = regs->r_ss & 0xffff; - if (!VALID_USER_DSEL(sel)) + if (!VALID_USER_DSEL(sel)) return EINVAL; sel = regs->r_cs & 0xffff; diff --git a/sys/arch/amd64/amd64/vmm_support.S b/sys/arch/amd64/amd64/vmm_support.S index 404cc2e9a62..c328fb138ed 100644 --- a/sys/arch/amd64/amd64/vmm_support.S +++ b/sys/arch/amd64/amd64/vmm_support.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm_support.S,v 1.16 2019/05/17 19:07:16 guenther Exp $ */ +/* $OpenBSD: vmm_support.S,v 1.17 2021/02/13 07:47:37 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -24,7 +24,7 @@ /* * XXX duplicated in vmmvar.h due to song-and-dance with sys/rwlock.h inclusion - * here + * here */ #define VMX_FAIL_LAUNCH_UNKNOWN 1 #define VMX_FAIL_LAUNCH_INVALID_VMCS 2 @@ -317,9 +317,9 @@ l1df_load_cache: /* XXX get the right cacheline size from cpuid */ addq $0x40, %r9 cmpq $VMX_L1D_FLUSH_SIZE, %r9 - jne l1df_load_cache + jne l1df_load_cache lfence - + done_flush: testq %r8, %r8 jnz do_resume @@ -475,7 +475,7 @@ restore_host: popq %r15 RETGUARD_POP(r11) - + /* * Restore saved MSRs */ @@ -489,7 +489,7 @@ restore_host: popq %rax movq $MSR_CSTAR, %rcx wrmsr - + popq %rdx popq %rax movq $MSR_LSTAR, %rcx @@ -514,7 +514,7 @@ restore_host: popq %rdx popq %rax movq $MSR_GSBASE, %rcx - wrmsr + wrmsr popw %fs popq %rdx @@ -533,8 +533,8 @@ restore_host: movq %rdi, %rax RETGUARD_CHECK(vmx_enter_guest, r11) - ret - + ret + _C_LABEL(svm_enter_guest): RETGUARD_SETUP(svm_enter_guest, r11) clgi @@ -686,7 +686,7 @@ restore_host_svm: popq %r15 RETGUARD_POP(r11) - + /* * Restore saved MSRs */ @@ -700,7 +700,7 @@ restore_host_svm: popq %rax movq $MSR_CSTAR, %rcx wrmsr - + popq %rdx popq %rax movq $MSR_LSTAR, %rcx @@ -726,7 +726,7 @@ restore_host_svm: popq %rdx popq %rax movq $MSR_GSBASE, %rcx - wrmsr + wrmsr popw %fs popq %rdx @@ -752,7 +752,7 @@ restore_host_svm: /* rdx = GDTR base addr */ andb $0xF9, 5(%rdx, %rax) - + ltrw %ax popfq @@ -760,4 +760,4 @@ restore_host_svm: movq %rdi, %rax RETGUARD_CHECK(svm_enter_guest, r11) - ret + ret |