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

Unverified Commit 9272f3a3 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-23100-LAHAINA.QSSI14.0' of... 

Merge tag 'LA.UM.9.14.r1-23100-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina

"LA.UM.9.14.r1-23100-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-23100-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  Revert "ALSA: compress: Allow pause and resume during draining"
  ALSA: compress: Allow pause and resume during draining
  msm: kgsl: Prevent wrap around during user address mapping
  msm: kgsl: Limit the syncpoint count for AUX commands
  msm: kgsl: Prevent wrap around during user address mapping
  Configured process_madvise with upstream syscall number
  iommu: Fix missing return check of arm_lpae_init_pte
  usb: gadget: cdev: Don't use spinlock with sleeping functions
  securemsm-kernel: Fix multiple listener registration on same fd
  msm: kgsl: Limit the syncpoint count for AUX commands
  net: qrtr: use new update_marker api
  char: virtio_eavb: use new update_marker api
  usb: kpi: update_marker api for USB suspend resume

Change-Id: Id82b63ff555fbc7101b41a10c1ffbef3762627bd
parents 17aff287 703745fc

arch/alpha/kernel/syscalls/syscall.tbl

+5 −1
Original line number Diff line number Diff line
@@ -475,4 +475,8 @@ 
543	common	fspick				sys_fspick

544	common	pidfd_open			sys_pidfd_open

# 545 reserved for clone3

546	common	process_madvise			sys_process_madvise
 
# 546 reserved for close_range

# 547 reserved for openat2

# 548 reserved for pidfd_getfd

# 549 reserved for faccessat2

550	common	process_madvise			sys_process_madvise

arch/arm/tools/syscall.tbl

+5 −1
Original line number Diff line number Diff line
@@ -449,4 +449,8 @@ 
433	common	fspick				sys_fspick

434	common	pidfd_open			sys_pidfd_open

435	common	clone3				sys_clone3

436	common	process_madvise			sys_process_madvise
 
# 436 reserved for close_range

# 437 reserved for openat2

# 438 reserved for pidfd_getfd

# 439 reserved for faccessat2

440	common	process_madvise			sys_process_madvise

arch/arm64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)

#define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)



#define __NR_compat_syscalls		437

#define __NR_compat_syscalls		441

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ __SYSCALL(__NR_fspick, sys_fspick) 
__SYSCALL(__NR_pidfd_open, sys_pidfd_open)

#define __NR_clone3 435

__SYSCALL(__NR_clone3, sys_clone3)

#define __NR_process_madvise 436

#define __NR_process_madvise 440

__SYSCALL(__NR_process_madvise, sys_process_madvise)



/*

arch/ia64/kernel/syscalls/syscall.tbl

+5 −1
Original line number Diff line number Diff line
@@ -356,4 +356,8 @@ 
433	common	fspick				sys_fspick

434	common	pidfd_open			sys_pidfd_open

# 435 reserved for clone3

436	common	process_madvise			sys_process_madvise
 
# 436 reserved for close_range

# 437 reserved for openat2

# 438 reserved for pidfd_getfd

# 439 reserved for faccessat2

440	common	process_madvise			sys_process_madvise