Преглед на файлове

HBSD: Resolve one more merge conflict

Somehow this merge conflict resolution wasn't included before.

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
remotes/github/hardened/12-stable/master
Shawn Webb преди 3 месеца
родител
ревизия
1d4264d9d7
променени са 1 файла, в които са добавени 0 реда и са изтрити 3 реда
  1. +0
    -3
      sys/x86/include/specialreg.h

+ 0
- 3
sys/x86/include/specialreg.h Целия файл

@@ -583,16 +583,13 @@
#define MSR_PP1_ENERGY_STATUS 0x641
#define MSR_PPERF 0x64e
#define MSR_TSC_DEADLINE 0x6e0 /* Writes are not serializing */
<<<<<<< HEAD
#define MSR_IA32_DEBUG_INTERFACE 0xc80 /* Intel Silicon Debug interface */
=======
#define MSR_IA32_PM_ENABLE 0x770
#define MSR_IA32_HWP_CAPABILITIES 0x771
#define MSR_IA32_HWP_REQUEST_PKG 0x772
#define MSR_IA32_HWP_INTERRUPT 0x773
#define MSR_IA32_HWP_REQUEST 0x774
#define MSR_IA32_HWP_STATUS 0x777
>>>>>>> origin/freebsd/12-stable/master

/*
* VMX MSRs


Зареждане…
Отказ
Запис