Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908f376e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: vservices: fix client and server to work for UFS"

parents a0eb66fb 17405d14

arch/arm64/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -899,6 +899,13 @@ config XEN 
	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64.



config OKL4_GUEST

	bool "OKL4 Hypervisor guest support"

	depends on ARM64 && OF

	default n

	help

	  Say Y if you want to run Linux as a guest of the OKL4 hypervisor



config FORCE_MAX_ZONEORDER

	int

	default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ source "drivers/hv/Kconfig" 


source "drivers/xen/Kconfig"



source "drivers/vservices/Kconfig"



source "drivers/staging/Kconfig"



source "drivers/platform/Kconfig"

drivers/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ obj-y += bus/ 


obj-$(CONFIG_GENERIC_PHY)	+= phy/



obj-$(CONFIG_VSERVICES_SUPPORT)	+= vservices/



# GPIO must come after pinctrl as gpios may need to mux pins etc

obj-$(CONFIG_PINCTRL)		+= pinctrl/

obj-$(CONFIG_GPIOLIB)		+= gpio/

drivers/block/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -485,3 +485,23 @@ config BLK_DEV_RSXX 
	  module will be called rsxx.



endif # BLK_DEV



config VSERVICES_BLOCK_SERVER

	tristate "Virtual Services block server"

	depends on BLOCK && VSERVICES_SUPPORT && VSERVICES_SERVER

	default y

	select VSERVICES_PROTOCOL_BLOCK_SERVER

	help

	  Select this option if you want support for server side Virtual

	  Services block. This allows any Linux block device to be

	  virtualized and exported as a virtual service.



config VSERVICES_BLOCK_CLIENT

	tristate "Virtual Services Block client device"

	depends on BLOCK && VSERVICES_SUPPORT && VSERVICES_CLIENT

	default y

	select VSERVICES_PROTOCOL_BLOCK_CLIENT

	help

	  Select this option if you want support for client side Virtual

	  Services block devices. The virtual block devices are typically

	  named /dev/vblock0, /dev/vblock1, etc.

drivers/block/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -41,3 +41,8 @@ obj-$(CONFIG_ZRAM) += zram/ 


skd-y		:= skd_main.o

swim_mod-y	:= swim.o swim_asm.o



obj-$(CONFIG_VSERVICES_BLOCK_SERVER)     += vs_block_server.o

CFLAGS_vs_block_server.o += -Werror

obj-$(CONFIG_VSERVICES_BLOCK_CLIENT)     += vs_block_client.o

CFLAGS_vs_block_client.o += -Werror