Commit a18e2fa5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes and clean-ups from Catalin Marinas:
 "Here's a second pull request for this merging window with some
  fixes/clean-ups:

   - __cmpxchg_double*() return type fix to avoid truncation of a long
     to int and subsequent logical "not" in cmpxchg_double()
     misinterpreting the operation success/failure

   - BPF fixes for mod and div by zero

   - Fix compilation with STRICT_MM_TYPECHECKS enabled

   - VDSO build fix without libgcov

   - Some static and __maybe_unused annotations

   - Kconfig clean-up (FRAME_POINTER)

   - defconfig update for CRYPTO_CRC32_ARM64"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: suspend: make hw_breakpoint_restore static
  arm64: mmu: make split_pud and fixup_executable static
  arm64: smp: make of_parse_and_init_cpus static
  arm64: use linux/types.h in kvm.h
  arm64: build vdso without libgcov
  arm64: mark cpus_have_hwcap as __maybe_unused
  arm64: remove redundant FRAME_POINTER kconfig option and force to select it
  arm64: fix R/O permissions of FDT mapping
  arm64: fix STRICT_MM_TYPECHECKS issue in PTE_CONT manipulation
  arm64: bpf: fix mod-by-zero case
  arm64: bpf: fix div-by-zero case
  arm64: Enable CRYPTO_CRC32_ARM64 in defconfig
  arm64: cmpxchg_dbl: fix return value type
parents 7dac7102 01b305a2

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config ARM64 
	select CPU_PM if (SUSPEND || CPU_IDLE)

	select DCACHE_WORD_ACCESS

	select EDAC_SUPPORT

	select FRAME_POINTER

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS_BROADCAST

arch/arm64/Kconfig.debug

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ menu "Kernel hacking" 


source "lib/Kconfig.debug"



config FRAME_POINTER

	bool

	default y



config ARM64_PTDUMP

	bool "Export kernel pagetable layout to userspace via debugfs"

	depends on DEBUG_KERNEL

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -224,3 +224,4 @@ CONFIG_CRYPTO_GHASH_ARM64_CE=y 
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y

CONFIG_CRYPTO_AES_ARM64_CE_BLK=y

CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y

CONFIG_CRYPTO_CRC32_ARM64=y

arch/arm64/include/asm/atomic_ll_sc.h

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ __CMPXCHG_CASE( , , mb_8, dmb ish, , l, "memory") 
#undef __CMPXCHG_CASE



#define __CMPXCHG_DBL(name, mb, rel, cl)				\

__LL_SC_INLINE int							\

__LL_SC_INLINE long							\

__LL_SC_PREFIX(__cmpxchg_double##name(unsigned long old1,		\

				      unsigned long old2,		\

				      unsigned long new1,		\

arch/arm64/include/asm/atomic_lse.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ __CMPXCHG_CASE(x, , mb_8, al, "memory") 
#define __LL_SC_CMPXCHG_DBL(op)	__LL_SC_CALL(__cmpxchg_double##op)



#define __CMPXCHG_DBL(name, mb, cl...)					\

static inline int __cmpxchg_double##name(unsigned long old1,		\

static inline long __cmpxchg_double##name(unsigned long old1,		\

					 unsigned long old2,		\

					 unsigned long new1,		\

					 unsigned long new2,		\

CRA Git | Maintained and supported by SUSTech CRA and CCSE