Merge tag 'LV.AU.0.1.0.r2-03300-qtiquingvm.0' into q
"LV.AU.0.1.0.r2-03300-qtiquingvm.0" * tag 'LV.AU.0.1.0.r2-03300-qtiquingvm.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.14: defconfig: disable QCOM_SECURE_BUFFER for lxc container ARM: dts: msm: Add multiple dri device nodes for sa8195 lxc gvm ARM: dts: msm: disable avb for lv container binderfs: use refcount for binder control devices too Revert "security: selinux: allow per-file labelling for binderfs" ARM: dts: msm: Enable PCIe0 for S8155 Single LV GVM Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
@@ -21,3 +21,20 @@
|
||||
qcom,pmic-name = "PM8195";
|
||||
qcom,board-id = <0x1000002 0>;
|
||||
};
|
||||
|
||||
&soc {
|
||||
sde_kms_hyp1: qcom,sde_kms_hyp@ae10000 {
|
||||
compatible = "qcom,sde-kms-hyp";
|
||||
qcom,client-id = "7815";
|
||||
};
|
||||
|
||||
sde_kms_hyp2: qcom,sde_kms_hyp@ae20000 {
|
||||
compatible = "qcom,sde-kms-hyp";
|
||||
qcom,client-id = "7818";
|
||||
};
|
||||
|
||||
sde_kms_hyp3: qcom,sde_kms_hyp@ae30000 {
|
||||
compatible = "qcom,sde-kms-hyp";
|
||||
qcom,client-id = "7819";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
/delete-node/ rename_blk;
|
||||
};
|
||||
|
||||
&hab {
|
||||
|
||||
@@ -457,7 +457,6 @@ CONFIG_MSM_PIL=y
|
||||
CONFIG_MSM_PIL_SSR_GENERIC=y
|
||||
CONFIG_MSM_BOOT_STATS=y
|
||||
CONFIG_MSM_BOOT_TIME_MARKER=y
|
||||
CONFIG_QCOM_SECURE_BUFFER=y
|
||||
CONFIG_QCOM_GLINK=y
|
||||
CONFIG_MEM_SHARE_QMI_SERVICE=y
|
||||
CONFIG_MSM_HAB=y
|
||||
|
||||
@@ -468,7 +468,6 @@ CONFIG_MSM_PIL=y
|
||||
CONFIG_MSM_PIL_SSR_GENERIC=y
|
||||
CONFIG_MSM_BOOT_STATS=y
|
||||
CONFIG_MSM_BOOT_TIME_MARKER=y
|
||||
CONFIG_QCOM_SECURE_BUFFER=y
|
||||
CONFIG_QCOM_GLINK=y
|
||||
CONFIG_MEM_SHARE_QMI_SERVICE=y
|
||||
CONFIG_MSM_HAB=y
|
||||
|
||||
@@ -448,6 +448,7 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
|
||||
inode->i_uid = info->root_uid;
|
||||
inode->i_gid = info->root_gid;
|
||||
|
||||
refcount_set(&device->ref, 1);
|
||||
device->binderfs_inode = inode;
|
||||
device->miscdev.minor = minor;
|
||||
|
||||
|
||||
@@ -870,7 +870,6 @@ static int selinux_set_mnt_opts(struct super_block *sb,
|
||||
!strcmp(sb->s_type->name, "tracefs") ||
|
||||
!strcmp(sb->s_type->name, "sysfs") ||
|
||||
!strcmp(sb->s_type->name, "pstore") ||
|
||||
!strcmp(sb->s_type->name, "binder") ||
|
||||
!strcmp(sb->s_type->name, "cgroup") ||
|
||||
!strcmp(sb->s_type->name, "cgroup2"))
|
||||
sbsec->flags |= SE_SBGENFS;
|
||||
|
||||
Reference in New Issue
Block a user