*** specialreg.h.orig	Tue Jun  9 05:16:51 2009
--- specialreg.h	Sat Feb 27 15:17:01 2010
***************
*** 1,4 ****
! /*	$OpenBSD: specialreg.h,v 1.14 2009/05/31 03:20:10 matthieu Exp $	*/
  /*	$NetBSD: specialreg.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $	*/
  /*	$NetBSD: x86/specialreg.h,v 1.2 2003/04/25 21:54:30 fvdl Exp $	*/
  
--- 1,4 ----
! /*	$OpenBSD: specialreg.h,v 1.17 2009/10/07 02:15:48 kevlo Exp $	*/
  /*	$NetBSD: specialreg.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $	*/
  /*	$NetBSD: x86/specialreg.h,v 1.2 2003/04/25 21:54:30 fvdl Exp $	*/
  
***************
*** 257,262 ****
--- 257,265 ----
  #define MSR_MC3_ADDR		0x412
  #define MSR_MC3_MISC		0x413
  
+ /* VIA MSR */
+ #define MSR_CENT_TMTEMPERATURE	0x1423	/* Thermal monitor temperature */
+ 
  /*
   * AMD K6/K7 MSRs.
   */
***************
*** 298,308 ****
--- 301,313 ----
   * These require a 'passcode' for access.  See cpufunc.h.
   */
  #define	MSR_HWCR	0xc0010015
+ #define		HWCR_TLBCACHEDIS	0x00000008
  #define		HWCR_FFDIS		0x00000040
  
  #define	MSR_NB_CFG	0xc001001f
  #define		NB_CFG_DISIOREQLOCK	0x0000000000000004ULL
  #define		NB_CFG_DISDATMSK	0x0000001000000000ULL
+ #define		NB_CFG_INITAPICCPUIDLO	(1ULL << 54)
  
  #define	MSR_LS_CFG	0xc0011020
  #define		LS_CFG_DIS_LS2_SQUISH	0x02000000
***************
*** 313,320 ****
--- 318,329 ----
  #define	MSR_DC_CFG	0xc0011022
  #define		DC_CFG_DIS_CNV_WC_SSO	0x00000004
  #define		DC_CFG_DIS_SMC_CHK_BUF	0x00000400
+ #define		DC_CFG_ERRATA_261	0x01000000
  
  #define	MSR_BU_CFG	0xc0011023
+ #define		BU_CFG_ERRATA_298	0x0000000000000002ULL
+ #define		BU_CFG_ERRATA_254	0x0000000000200000ULL
+ #define		BU_CFG_ERRATA_309	0x0000000000800000ULL
  #define		BU_CFG_THRL2IDXCMPDIS	0x0000080000000000ULL
  #define		BU_CFG_WBPFSMCCHKDIS	0x0000200000000000ULL
  #define		BU_CFG_WBENHWSBDIS	0x0001000000000000ULL