diff options
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel.shared | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_aliases | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/name_to_major | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/sys/fm/cpu/GMCA.h | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/sys/mc_intel.h | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index 62e5fb9f75..dee5a31f60 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -379,6 +379,7 @@ $(CLOSED_BUILD)DRV_KMODS += dca $(CLOSED_BUILD)CLOSED_DRV_KMODS += bmc $(CLOSED_BUILD)CLOSED_DRV_KMODS += elxl $(CLOSED_BUILD)CLOSED_DRV_KMODS += glm +$(CLOSED_BUILD)CLOSED_DRV_KMODS += intel_nhmex $(CLOSED_BUILD)CLOSED_DRV_KMODS += iprb $(CLOSED_BUILD)CLOSED_DRV_KMODS += llc2 $(CLOSED_BUILD)CLOSED_DRV_KMODS += marvell88sx diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases index dbedff44ab..b35d9deb02 100644 --- a/usr/src/uts/intel/os/driver_aliases +++ b/usr/src/uts/intel/os/driver_aliases @@ -48,6 +48,7 @@ intel_nb5000 "pci8086,4003" intel_nb5000 "pci8086,65c0" intel_nhm "pci8086,3423" intel_nhm "pci8086,372a" +intel_nhmex "pci8086,3422" xpv "pci5853,1.1" amd_iommu "pci1022,11ff" amd_iommu "pci1002,5a23" diff --git a/usr/src/uts/intel/os/name_to_major b/usr/src/uts/intel/os/name_to_major index c7b3a97986..625eb5f337 100644 --- a/usr/src/uts/intel/os/name_to_major +++ b/usr/src/uts/intel/os/name_to_major @@ -160,3 +160,4 @@ bridge 265 iptun 266 iptunq 267 bpf 268 +intel_nhmex 269 diff --git a/usr/src/uts/intel/sys/fm/cpu/GMCA.h b/usr/src/uts/intel/sys/fm/cpu/GMCA.h index 0e5a5cf82d..c84171873b 100644 --- a/usr/src/uts/intel/sys/fm/cpu/GMCA.h +++ b/usr/src/uts/intel/sys/fm/cpu/GMCA.h @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -138,6 +138,7 @@ extern "C" { #define FM_EREPORT_CPU_GENERIC_MMM_RD "" #define FM_EREPORT_CPU_GENERIC_MMM_WR "" #define FM_EREPORT_CPU_GENERIC_MMM_ADRCMD "" +#define FM_EREPORT_CPU_GENERIC_MMM_SCRUB "" /* * Ereport payload member names together with bitmask values to select diff --git a/usr/src/uts/intel/sys/mc_intel.h b/usr/src/uts/intel/sys/mc_intel.h index adcf186582..f0c83b1d8b 100644 --- a/usr/src/uts/intel/sys/mc_intel.h +++ b/usr/src/uts/intel/sys/mc_intel.h @@ -44,8 +44,10 @@ extern "C" { #define MCINTEL_NVLIST_DIMMS "memory-dimms" #define MCINTEL_NVLIST_DIMMSZ "memory-dimm-size" #define MCINTEL_NVLIST_NRANKS "dimm-max-ranks" +#define MCINTEL_NVLIST_NDIMMS "dimm-max-dimms" #define MCINTEL_NVLIST_RANKS "dimm-ranks" #define MCINTEL_NVLIST_1ST_RANK "dimm-start-rank" +#define MCINTEL_NVLIST_DIMM_NUM "dimm-number" #define MCINTEL_NVLIST_ROWS "dimm-rows" #define MCINTEL_NVLIST_COL "dimm-column" #define MCINTEL_NVLIST_BANK "dimm-banks" |