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

Commit 5f243b9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM64 fixes from Catalin Marinas:
 - Missing include in asm/compat.h.
 - Kconfig updates.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: Always select ARM_AMBA and GENERIC_GPIO
  arm64: Keep the ARM64 Kconfig selects sorted
  arm64: Include linux/ptrace.h in asm/compat.h
parents 6ed19149 25c92a37

arch/arm64/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ config ARM64 
	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARM_AMBA

	select CLONE_BACKWARDS

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_HARDIRQS_NO_DEPRECATED
@@ -31,7 +33,6 @@ config ARM64 
	select RTC_LIB

	select SPARSE_IRQ

	select SYSCTL_EXCEPTION_TRACE

	select CLONE_BACKWARDS

	help

	  ARM 64-bit (AArch64) Linux support.
@@ -90,6 +91,9 @@ config SWIOTLB 
config IOMMU_HELPER

	def_bool SWIOTLB



config GENERIC_GPIO

	def_bool y



source "init/Kconfig"



source "kernel/Kconfig.freezer"

arch/arm64/include/asm/compat.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include <linux/types.h>

#include <linux/sched.h>

#include <linux/ptrace.h>



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"armv8l\0\0"