Revert "module: icp: move kcf_cipher.c to os/linux"

This reverts commit 2d4afae.

configure.ac

@@ -179,7 +179,6 @@ AC_CONFIG_FILES([
 	module/nvpair/Makefile
 	module/os/linux/spl/Makefile
 	module/os/linux/zfs/Makefile
-	module/os/linux/icp/Makefile
 	module/spl/Makefile
 	module/unicode/Makefile
 	module/zcommon/Makefile

lib/libicp/Makefile.am

@@ -28,6 +28,7 @@ endif
 KERNEL_C = \
 	spi/kcf_spi.c \
 	api/kcf_ctxops.c \
+	api/kcf_cipher.c \
 	api/kcf_mac.c \
 	algs/aes/aes_impl_aesni.c \
 	algs/aes/aes_impl_generic.c \
@@ -60,10 +61,6 @@ KERNEL_C = \
 	core/kcf_prov_tabs.c \
 	$(ASM_SOURCES_C)
 
-if BUILD_LINUX
-KERNEL_C += ../os/linux/icp/api/kcf_cipher.c
-endif
-
 KERNEL_ASM = $(ASM_SOURCES_AS)
 
 nodist_libicp_la_SOURCES = \

module/icp/Makefile.in

@@ -2,10 +2,8 @@ ifneq ($(KBUILD_EXTMOD),)
 src = @abs_srcdir@
 obj = @abs_builddir@
 icp_include = $(src)/include
-mfdir = $(obj)
 else
 icp_include = $(srctree)/$(src)/include
-mfdir = $(srctree)/$(src)
 endif
 
 MODULE := icp
@@ -16,6 +14,7 @@ asflags-y := -I$(icp_include)
 ccflags-y := -I$(icp_include)
 
 $(MODULE)-objs += illumos-crypto.o
+$(MODULE)-objs += api/kcf_cipher.o
 $(MODULE)-objs += api/kcf_mac.o
 $(MODULE)-objs += api/kcf_ctxops.o
 $(MODULE)-objs += core/kcf_callprov.o
@@ -95,5 +94,3 @@ ICP_DIRS = \
 
 all:
 	mkdir -p $(ICP_DIRS)
-
-include $(mfdir)/../os/linux/icp/Makefile