justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-09 16:04:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[kernel] Fix merge conflict getting committed in cpu.cpp

Browse Source
This commit is contained in:
Justin C. Miller
2023-03-16 20:08:05 -07:00
parent 90cf1e2220
commit 459b40ad57
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/cpu.cpp
View File

@@ -156,12 +156,8 @@ bsp_late_init()
uint64_t xcr0v = get_xcr0(); uint64_t xcr0v = get_xcr0();
uint64_t efer = rdmsr(msr::ia32_efer); uint64_t efer = rdmsr(msr::ia32_efer);
<<<<<<< HEAD
log::spam(logs::boot, "Control regs: cr0:%lx cr4:%lx efer:%lx mxcsr:%x xcr0:%x", cr0v, cr4v, efer, mxcsrv, xcr0v); log::spam(logs::boot, "Control regs: cr0:%lx cr4:%lx efer:%lx mxcsr:%x xcr0:%x", cr0v, cr4v, efer, mxcsrv, xcr0v);
=======
log::spam(logs::boot, "Control regs: cr0:%lx cr4:%lx efer:%lx", cr0v, cr4v, efer);
cpu_validate(&g_bsp_cpu_data); cpu_validate(&g_bsp_cpu_data);
>>>>>>> 66a5273 ([cpu] Rename cpu_id::validate() to cpu_id::features())
} }
cpu_data * cpu_data *