diff options
| author | Jason King <jason.king@joyent.com> | 2020-12-17 18:19:51 +0000 |
|---|---|---|
| committer | Jason King <jason.king@joyent.com> | 2020-12-17 18:19:51 +0000 |
| commit | 25bf0be6ef43aa536901136692fe4be39e895e78 (patch) | |
| tree | edc2107dc25de01d51931d7f286d77de76a371da /usr/src/uts/intel/Makefile.intel | |
| parent | 3bdb9ca09b6ab38d614222a74178b2590facf48b (diff) | |
| parent | 93d78aba5b32996fc2ae893a6237a0d3972f86b2 (diff) | |
| download | illumos-joyent-25bf0be6ef43aa536901136692fe4be39e895e78.tar.gz | |
[illumos-gate merge]
commit 93d78aba5b32996fc2ae893a6237a0d3972f86b2
13301 bhyve PIT not periodic for square wave mode
commit 0aaef2f550fa500248f59b0b8a14225b5afbd198
13258 remove lint from the uts build
commit 1a5f1879be09d3de900b2510692dd12003784d84
13361 bhyve should mask RDT cpuid info
Conflicts:
usr/src/uts/common/Makefile.rules
usr/src/uts/intel/Makefile
usr/src/uts/intel/core_pcbe/Makefile
usr/src/uts/intel/opteron_pcbe/Makefile
usr/src/uts/intel/p4_pcbe/Makefile
usr/src/uts/intel/sockpfp/Makefile
usr/src/uts/sparc/icmp/Makefile
usr/src/uts/sparc/iptun/Makefile
usr/src/uts/sparc/sockpfp/Makefile
usr/src/uts/sparc/spdsock/Makefile
Diffstat (limited to 'usr/src/uts/intel/Makefile.intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 39166ec07f..fdaee2f09d 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -53,14 +53,10 @@ GENASSYM_DIR = $(UTSBASE)/intel/genassym IPDRV_DIR = $(UTSBASE)/intel/ip MODSTUBS_DIR = $(UNIX_DIR) DSF_DIR = $(UTSBASE)/$(PLATFORM)/genassym -LINTS_DIR = $(OBJS_DIR) -LINT_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o GENLIB = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so MODSTUBS_O = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o -LINT_LIB = $(UTSBASE)/i86pc/lint-libs/$(OBJS_DIR)/llib-lunix.ln -GEN_LINT_LIB = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)/llib-lgenunix.ln # # Include the makefiles which define build rule templates, the @@ -744,13 +740,6 @@ KICONV_KMODS += kiconv_emea kiconv_ja kiconv_ko kiconv_sc kiconv_tc DACF_KMODS += net_dacf # -# Ensure that the variable member of the cpu_t (cpu_m) is defined -# for the lint builds so as not to cause lint errors during the -# global cross check. -# -LINTFLAGS += -D_MACHDEP -I$(UTSBASE)/i86pc - -# # Sensor related drivers # DRV_KMODS += ksensor ksensor_test |