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

Commit 06f4c52a authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (a5647262) into msm-5.4 



* refs/heads/tmp-a5647262:
  ANDROID: gki_defconfig: initialize locals with zeroes
  UPSTREAM: security: allow using Clang's zero initialization for stack variables
  BACKPORT: net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()
  UPSTREAM: spi: add power control when set_cs
  UPSTREAM: nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage
  ANDROID: ABI: Update allowed list for QCOM

Change-Id: If9451d95dac1c5414d25aff4bb115bc1a94df07b
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 3e8eac83 a5647262

Makefile

+11 −2
Original line number Diff line number Diff line
@@ -808,11 +808,20 @@ KBUILD_CFLAGS += -fomit-frame-pointer 
endif

endif



# Initialize all stack variables with a pattern, if desired.

ifdef CONFIG_INIT_STACK_ALL

# Initialize all stack variables with a 0xAA pattern.

ifdef CONFIG_INIT_STACK_ALL_PATTERN

KBUILD_CFLAGS	+= -ftrivial-auto-var-init=pattern

endif



# Initialize all stack variables with a zero value.

ifdef CONFIG_INIT_STACK_ALL_ZERO

# Future support for zero initialization is still being debated, see

# https://bugs.llvm.org/show_bug.cgi?id=45497. These flags are subject to being

# renamed or dropped.

KBUILD_CFLAGS	+= -ftrivial-auto-var-init=zero

KBUILD_CFLAGS	+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang

endif



DEBUG_CFLAGS	:= $(call cc-option, -fno-var-tracking-assignments)



ifdef CONFIG_DEBUG_INFO

android/abi_gki_aarch64.xml

+659 −635

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_d6430e6763.xml

+490 −587

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+6 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,12 @@ 
  memmove

  memory_read_from_buffer

  memparse

  mempool_alloc

  mempool_alloc_slab

  mempool_create

  mempool_destroy

  mempool_free

  mempool_free_slab

  memremap

  memset

  __memset_io

arch/arm64/configs/gki_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ CONFIG_FORTIFY_SOURCE=y 
CONFIG_STATIC_USERMODEHELPER=y

CONFIG_STATIC_USERMODEHELPER_PATH=""

CONFIG_SECURITY_SELINUX=y

CONFIG_INIT_STACK_ALL=y

CONFIG_INIT_STACK_ALL_ZERO=y

CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y

CONFIG_CRYPTO_ADIANTUM=y

CONFIG_CRYPTO_LZ4=y