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

Commit 3eb55872 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: secure_buffer: Add SPSS_SP vmid" into msm-next

parents 8989da04 c8966533

drivers/soc/qcom/secure_buffer.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 Google, Inc

 * Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -412,6 +412,8 @@ const char *msm_secure_vmid_to_string(int secure_vmid) 
		return "VMID_WLAN_CE";

	case VMID_CP_CAMERA_PREVIEW:

		return "VMID_CP_CAMERA_PREVIEW";

	case VMID_CP_SPSS_SP:

		return "VMID_CP_SPSS_SP";

	case VMID_INVAL:

		return "VMID_INVAL";

	default:

include/soc/qcom/secure_buffer.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -37,6 +37,7 @@ enum vmid { 
	VMID_CP_APP = 0x12,

	VMID_WLAN = 0x18,

	VMID_WLAN_CE = 0x19,

	VMID_CP_SPSS_SP = 0x1A,

	VMID_CP_CAMERA_PREVIEW = 0x1D,

	VMID_LAST,

	VMID_INVAL = -1