diff options
| author | Jake Saferstein <jake.saferstein@joyent.com> | 2018-08-24 20:25:33 +0000 |
|---|---|---|
| committer | Jake Saferstein <jake.saferstein@joyent.com> | 2018-08-24 20:25:33 +0000 |
| commit | 3f4f6ac29c31fe8535aca67e6737a9739dc47887 (patch) | |
| tree | df20cf97736bf7585d245fc07f28a461d9c315ad | |
| parent | 57521e824413609bf96050c665ef3ca453ab788f (diff) | |
| download | illumos-joyent-3f4f6ac29c31fe8535aca67e6737a9739dc47887.tar.gz | |
Quick cleanup pass
| -rw-r--r-- | usr/src/uts/aarch64/os/flush.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/armv8/genunix/Makefile | 130 |
2 files changed, 3 insertions, 133 deletions
diff --git a/usr/src/uts/aarch64/os/flush.c b/usr/src/uts/aarch64/os/flush.c index 080121e681..a234ee8ccf 100644 --- a/usr/src/uts/aarch64/os/flush.c +++ b/usr/src/uts/aarch64/os/flush.c @@ -26,7 +26,7 @@ void arm_text_flush(caddr_t start, size_t len) { // aarch64_text_flush_range(start, len); - ///XXX we should implement this. However, I think the i-cache - // is disabled by default anyways... - + ///XXX we should implement this. however the assembly arm gave us + //hangs, and the i-cache is disabled when this is called during + // krtld anyways... }
\ No newline at end of file diff --git a/usr/src/uts/armv8/genunix/Makefile b/usr/src/uts/armv8/genunix/Makefile index 4a6e2fa7cf..adafc82808 100644 --- a/usr/src/uts/armv8/genunix/Makefile +++ b/usr/src/uts/armv8/genunix/Makefile @@ -155,133 +155,3 @@ include $(UTSBASE)/armv8/Makefile.targ # $(MODULE).lint := GEN_LINT_LIB = - -# # -# # This makefile drives the production of the generic -# # unix kernel module. -# # -# # ARM implementation architecture dependent -# # - -# # -# # Path to the base of the uts directory tree (usually /usr/src/uts). -# # -# UTSBASE = ../.. - -# # -# # Define the module and object file sets. -# # -# MODULE = genunix -# GENUNIX = $(OBJS_DIR)/$(MODULE) - -# OBJECTS = $(GENUNIX_OBJS:%=$(OBJS_DIR)/%) \ -# $(NOT_YET_KMODS:%=$(OBJS_DIR)/%) - -# ROOTMODULE = $(ROOT_KERN_DIR)/$(MODULE) - -# LIBGEN = $(OBJS_DIR)/libgenunix.so -# LIBSTUBS = $(GENSTUBS_OBJS:%=$(OBJS_DIR)/%) - -# # -# # Include common rules. -# # -# include $(UTSBASE)/arm/Makefile.arm - -# # -# # Define targets -# # -# ALL_TARGET = $(LIBGEN) -# INSTALL_TARGET = $(GENUNIX) $(ROOTMODULE) $(LIBGEN) - -# # -# # Overrides -# # -# CLEANFILES += $(LIBSTUBS) $(LIBGEN) -# BINARY = - -# # -# # Non-patch genunix builds merge a version of the ip module called ipctf. This -# # is to ensure that the common network-related types are included in genunix and -# # can thus be uniquified out of other modules. We don't want to do this for -# # patch builds, since we can't guarantee that ip and genunix will be in the same -# # patch. -# # -# #IPCTF_TARGET = $(IPCTF) -# IPCTF_TARGET= #XXX: We don't have ip yet -# $(PATCH_BUILD)IPCTF_TARGET = - -# CPPFLAGS += -I$(SRC)/common -# CPPFLAGS += -I$(SRC)/uts/common/fs/zfs - -# #XXX: If this is necessary, something is wrong surely? -# CPPFLAGS += -I$(UTSBASE)/armv7 - -# CERRWARN += -_gcc=-Wno-unused-label -# CERRWARN += -_gcc=-Wno-unused-variable -# CERRWARN += -_gcc=-Wno-unused-value -# CERRWARN += -_gcc=-Wno-unused-function -# CERRWARN += -_gcc=-Wno-parentheses -# CERRWARN += -_gcc=-Wno-switch -# CERRWARN += -_gcc=-Wno-type-limits -# CERRWARN += -_gcc=-Wno-uninitialized -# CERRWARN += -_gcc=-Wno-clobbered -# CERRWARN += -_gcc=-Wno-empty-body - -# # -# # XXX fix this -# # -# CERRWARN += -_gcc=-Wno-unused-but-set-variable - -# # -# # Ensure that lint sees 'struct cpu' containing a fully declared -# # embedded 'struct machcpu' -# # -# LINTFLAGS += -D_MACHDEP -I../../armv7 - -# # -# # Default build targets. -# # -# .KEEP_STATE: - -# # -# # XXX I clearly have something wrong here such that this Makefile is being made -# # in the wrong one. I've changed the default target and def/all as a result. -# # -# def: $(DEF_DEPS) - -# all: $(ALL_DEPS) - -# clean: $(CLEAN_DEPS) - -# clobber: $(CLOBBER_DEPS) - -# lint: $(LINT_DEPS) - -# modlintlib: $(MODLINTLIB_DEPS) - -# clean.lint: $(CLEAN_LINT_DEPS) - -# install: $(INSTALL_DEPS) - -# $(LIBGEN): $(GENUNIX) $(LIBSTUBS) -# $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) - -# $(IPCTF_TARGET) ipctf_target: FRC -# @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR) -# @pwd - -# $(GENUNIX): $(IPCTF_TARGET) $(OBJECTS) -# $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS) -# $(CTFMERGE_GENUNIX_MERGE) -# $(POST_PROCESS) - -# # -# # Include common targets. -# # -# include $(UTSBASE)/arm/Makefile.targ - -# # -# # Override. -# # -# $(MODULE).lint := GEN_LINT_LIB = - |
