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

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

Merge "defconfig: Enable OKL4_GUEST flag"

parents 12cfe9b4 20146128

arch/arm64/configs/vendor/sm8150-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ CONFIG_CMA=y 
CONFIG_ZSMALLOC=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_OKL4_GUEST=y

# CONFIG_UNMAP_KERNEL_AT_EL0 is not set

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y

arch/arm64/configs/vendor/sm8150_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ CONFIG_CMA_DEBUGFS=y 
CONFIG_ZSMALLOC=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_OKL4_GUEST=y

# CONFIG_UNMAP_KERNEL_AT_EL0 is not set

CONFIG_PRINT_VMEMLAYOUT=y

CONFIG_ARMV8_DEPRECATED=y

drivers/vservices/protocol/block/client.c

+5 −5
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void block_handle_start(struct vs_service_device *service) 
	    to_client_driver(vsdrv)->client;



	vs_service_state_lock(service);

	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	_vs_client_block_req_open(state);
@@ -119,7 +119,7 @@ static void block_handle_reset(struct vs_service_device *service) 
	if (client->closed)

		client->closed(state);



	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	vs_service_state_unlock(service);

}
@@ -134,7 +134,7 @@ static void block_handle_start_bh(struct vs_service_device *service) 
	    to_client_driver(vsdrv)->client;



	vs_service_state_lock_bh(service);

	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	_vs_client_block_req_open(state);
@@ -160,7 +160,7 @@ static void block_handle_reset_bh(struct vs_service_device *service) 
	if (client->closed)

		client->closed(state);



	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	vs_service_state_unlock_bh(service);

}
@@ -265,7 +265,7 @@ static int block_client_probe(struct vs_service_device *service) 
		return PTR_ERR(state);



	state->service = vs_get_service(service);

	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	dev_set_drvdata(&service->dev, state);

drivers/vservices/protocol/block/server.c

+5 −6
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ static void block_handle_start(struct vs_service_device *service) 
	    to_server_driver(vsdrv)->server;



	vs_service_state_lock(service);

	state->state = VSERVICE_BLOCK_RESET_STATE;



	memset(&(state->state), 0, sizeof(state->state));

	vs_service_state_unlock(service);

}
@@ -83,7 +82,7 @@ static void block_handle_reset(struct vs_service_device *service) 
	if (server->closed)

		server->closed(state);



	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	vs_service_state_unlock(service);

}
@@ -98,7 +97,7 @@ static void block_handle_start_bh(struct vs_service_device *service) 
	    to_server_driver(vsdrv)->server;



	vs_service_state_lock_bh(service);

	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	vs_service_state_unlock_bh(service);

}
@@ -122,7 +121,7 @@ static void block_handle_reset_bh(struct vs_service_device *service) 
	if (server->closed)

		server->closed(state);



	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	vs_service_state_unlock_bh(service);

}
@@ -237,7 +236,7 @@ static int block_server_probe(struct vs_service_device *service) 
		return PTR_ERR(state);



	state->service = vs_get_service(service);

	state->state = VSERVICE_BLOCK_RESET_STATE;

	memset(&(state->state), 0, sizeof(state->state));



	dev_set_drvdata(&service->dev, state);