Commit 86074b85 authored by Darren Hart (VMware)'s avatar Darren Hart (VMware)
Browse files

Merge branch 'i2c/for-INT33FE' 

Merge branch 'i2c/for-INT33FE' of
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git


to prepare for an incoming INT33FE driver.

Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parents 298747b7 d1d84bb9

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 4

VERSION = 4

PATCHLEVEL = 11

PATCHLEVEL = 11

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Fearless Coyote

NAME = Fearless Coyote





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/tools/syscall.tbl

+1 −0
Original line number Original line Diff line number Diff line
@@ -411,3 +411,4 @@ 
394	common	pkey_mprotect		sys_pkey_mprotect

394	common	pkey_mprotect		sys_pkey_mprotect

395	common	pkey_alloc		sys_pkey_alloc

395	common	pkey_alloc		sys_pkey_alloc

396	common	pkey_free		sys_pkey_free

396	common	pkey_free		sys_pkey_free

397	common	statx			sys_statx

arch/arm64/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -1073,6 +1073,10 @@ config SYSVIPC_COMPAT 
	def_bool y

	def_bool y

	depends on COMPAT && SYSVIPC

	depends on COMPAT && SYSVIPC





config KEYS_COMPAT

	def_bool y

	depends on COMPAT && KEYS



endmenu

endmenu





menu "Power management options"

menu "Power management options"

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -251,7 +251,7 @@ static inline bool system_supports_fpsimd(void) 
static inline bool system_uses_ttbr0_pan(void)

static inline bool system_uses_ttbr0_pan(void)

{

{

	return IS_ENABLED(CONFIG_ARM64_SW_TTBR0_PAN) &&

	return IS_ENABLED(CONFIG_ARM64_SW_TTBR0_PAN) &&

		!cpus_have_cap(ARM64_HAS_PAN);

		!cpus_have_const_cap(ARM64_HAS_PAN);

}

}





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */

arch/arm64/kernel/cpuidle.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ int arm_cpuidle_init(unsigned int cpu) 
}

}





/**

/**

 * cpu_suspend() - function to enter a low-power idle state

 * arm_cpuidle_suspend() - function to enter a low-power idle state

 * @arg: argument to pass to CPU suspend operations

 * @arg: argument to pass to CPU suspend operations

 *

 *

 * Return: 0 on success, -EOPNOTSUPP if CPU suspend hook not initialized, CPU

 * Return: 0 on success, -EOPNOTSUPP if CPU suspend hook not initialized, CPU

CRA Git | Maintained and supported by SUSTech CRA and CCSE