Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: fix build errors

Browse source
This commit is contained in:
Gabriel2392 2023-01-03 10:03:07 +00:00
parent dc32d2987c
commit 9418752122
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/arm/Kconfig
View file

@ -22,8 +22,7 @@ menu "ARM GPU Configuration"
choice choice
prompt "Mali Version Configuration" prompt "Mali Version Configuration"
default MALI_DDK_VALHALL_R32P1 if $(PLATFORM_VERSION_FOR_GPU) = 12 default MALI_DDK_VALHALL_R32P1
default MALI_DDK_VALHALL_R32P1 if $(PLATFORM_VERSION_FOR_GPU) >= 13
help help
Select Mali GPU driver version. Select Mali GPU driver version.
@ -36,9 +35,6 @@ config MALI_DDK_VALHALL_R26P0
config MALI_DDK_VALHALL_R32P1 config MALI_DDK_VALHALL_R32P1
bool "Valhall r32p1 driver" bool "Valhall r32p1 driver"
config MALI_DDK_VALHALL_R38P1
bool "Valhall r38p1 driver"
endchoice endchoice
if MALI_DDK_VALHALL_R26P0 if MALI_DDK_VALHALL_R26P0
@ -49,8 +45,4 @@ if MALI_DDK_VALHALL_R32P1
source "drivers/gpu/arm/bv_r32p1/Kconfig" source "drivers/gpu/arm/bv_r32p1/Kconfig"
endif endif
if MALI_DDK_VALHALL_R38P1
source "drivers/gpu/arm/bv_r38p1/Kconfig"
endif
endmenu endmenu

3
drivers/sensorhub/vendor/Kconfig vendored
View file

@ -4,4 +4,5 @@ config SHUB_MTK
config SHUB_LSI config SHUB_LSI
tristate "lsi sensorhub" tristate "lsi sensorhub"
default y default y

4
net/netfilter/nf_conntrack_core.c
View file

@ -615,7 +615,9 @@ static void
destroy_conntrack(struct nf_conntrack *nfct) destroy_conntrack(struct nf_conntrack *nfct)
{ {
#ifdef CONFIG_KNOX_NCM
unsigned long flags; unsigned long flags;
#endif
struct nf_conn *ct = (struct nf_conn *)nfct; struct nf_conn *ct = (struct nf_conn *)nfct;
// SEC_PRODUCT_FEATURE_KNOX_SUPPORT_NPA { // SEC_PRODUCT_FEATURE_KNOX_SUPPORT_NPA {
@ -1581,7 +1583,9 @@ EXPORT_SYMBOL_GPL(nf_conntrack_alloc);
void nf_conntrack_free(struct nf_conn *ct) void nf_conntrack_free(struct nf_conn *ct)
{ {
#ifdef CONFIG_KNOX_NCM
unsigned long flags; unsigned long flags;
#endif
struct net *net = nf_ct_net(ct); struct net *net = nf_ct_net(ct);
/* A freed object has refcnt == 0, that's /* A freed object has refcnt == 0, that's