From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Sep 2021 20:25:49 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: microblaze-v5.16~39
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=35776f10513c0d523c5dd2f1b415f642497779e2

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM development updates from Russell King:

 - Rename "mod_init" and "mod_exit" so that initcall debug output is
   actually useful (Randy Dunlap)

 - Update maintainers entries for linux-arm-kernel to indicate it is
   moderated for non-subscribers (Randy Dunlap)

 - Move install rules to arch/arm/Makefile (Masahiro Yamada)

 - Drop unnecessary ARCH_NR_GPIOS definition (Linus Walleij)

 - Don't warn about atags_to_fdt() stack size (David Heidelberg)

 - Speed up unaligned copy_{from,to}_kernel_nofault (Arnd Bergmann)

 - Get rid of set_fs() usage (Arnd Bergmann)

 - Remove checks for GCC prior to v4.6 (Geert Uytterhoeven)

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9118/1: div64: Remove always-true __div64_const32_is_OK() duplicate
  ARM: 9117/1: asm-generic: div64: Remove always-true __div64_const32_is_OK()
  ARM: 9116/1: unified: Remove check for gcc < 4
  ARM: 9110/1: oabi-compat: fix oabi epoll sparse warning
  ARM: 9113/1: uaccess: remove set_fs() implementation
  ARM: 9112/1: uaccess: add __{get,put}_kernel_nofault
  ARM: 9111/1: oabi-compat: rework fcntl64() emulation
  ARM: 9114/1: oabi-compat: rework sys_semtimedop emulation
  ARM: 9108/1: oabi-compat: rework epoll_wait/epoll_pwait emulation
  ARM: 9107/1: syscall: always store thread_info->abi_syscall
  ARM: 9109/1: oabi-compat: add epoll_pwait handler
  ARM: 9106/1: traps: use get_kernel_nofault instead of set_fs()
  ARM: 9115/1: mm/maccess: fix unaligned copy_{from,to}_kernel_nofault
  ARM: 9105/1: atags_to_fdt: don't warn about stack size
  ARM: 9103/1: Drop ARCH_NR_GPIOS definition
  ARM: 9102/1: move theinstall rules to arch/arm/Makefile
  ARM: 9100/1: MAINTAINERS: mark all linux-arm-kernel@infradead list as moderated
  ARM: 9099/1: crypto: rename 'mod_init' & 'mod_exit' functions to be module-specific
---

35776f10513c0d523c5dd2f1b415f642497779e2
diff --cc arch/arm/Kconfig
index 99863022436d,51897e4cc413..fc196421b2ce
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -124,9 -126,7 +124,8 @@@ config AR
  	select PCI_SYSCALL if PCI
  	select PERF_USE_VMALLOC
  	select RTC_LIB
- 	select SET_FS
  	select SYS_SUPPORTS_APM_EMULATION
 +	select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
  	# Above selects are sorted alphabetically; please add new ones
  	# according to that.  Thanks.
  	help
diff --cc arch/arm/include/asm/thread_info.h
index a02799bd0cdf,d89931aed59f..9a18da3e10cc
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@@ -62,9 -59,12 +59,9 @@@ struct thread_info 
  	unsigned long		stack_canary;
  #endif
  	struct cpu_context_save	cpu_context;	/* cpu context */
- 	__u32			syscall;	/* syscall number */
+ 	__u32			abi_syscall;	/* ABI type and syscall nr */
  	__u8			used_cp[16];	/* thread used copro */
  	unsigned long		tp_value[2];	/* TLS registers */
 -#ifdef CONFIG_CRUNCH
 -	struct crunch_state	crunchstate;
 -#endif
  	union fp_state		fpstate __attribute__((aligned(8)));
  	union vfp_state		vfpstate;
  #ifdef CONFIG_ARM_THUMBEE
diff --cc ipc/sem.c
index 1a8b9f0ac047,ae8d9104b0a0..f833238df1ce
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@@ -2229,9 -2216,40 +2216,40 @@@ long __do_semtimedop(int semid, struct 
  
  	unlink_queue(sma, &queue);
  
- out_unlock_free:
+ out_unlock:
  	sem_unlock(sma, locknum);
  	rcu_read_unlock();
+ out:
+ 	return error;
+ }
+ 
+ static long do_semtimedop(int semid, struct sembuf __user *tsops,
+ 		unsigned nsops, const struct timespec64 *timeout)
+ {
+ 	struct sembuf fast_sops[SEMOPM_FAST];
+ 	struct sembuf *sops = fast_sops;
+ 	struct ipc_namespace *ns;
+ 	int ret;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 	if (nsops > ns->sc_semopm)
+ 		return -E2BIG;
+ 	if (nsops < 1)
+ 		return -EINVAL;
+ 
+ 	if (nsops > SEMOPM_FAST) {
 -		sops = kvmalloc_array(nsops, sizeof(*sops), GFP_KERNEL);
++		sops = kvmalloc_array(nsops, sizeof(*sops), GFP_KERNEL_ACCOUNT);
+ 		if (sops == NULL)
+ 			return -ENOMEM;
+ 	}
+ 
+ 	if (copy_from_user(sops, tsops, nsops * sizeof(*tsops))) {
+ 		ret =  -EFAULT;
+ 		goto out_free;
+ 	}
+ 
+ 	ret = __do_semtimedop(semid, sops, nsops, timeout, ns);
+ 
  out_free:
  	if (sops != fast_sops)
  		kvfree(sops);