Commit 256a6f43 authored by Huacai Chen's avatar Huacai Chen
Browse files

Merge tag 'asm-generic-6.11' into loongarch-next 

LoongArch architecture changes for 6.11 depend on the asm-generic
changes to avoid confliction, so merge them to create a base.
parents 0c383648 1a7b7326

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ remove-stale-files: 
	$(Q)$(srctree)/scripts/remove-stale-files



# Support for using generic headers in asm-generic

asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj

asm-generic := -f $(srctree)/scripts/Makefile.asm-headers obj



PHONY += asm-generic uapi-asm-generic

asm-generic: uapi-asm-generic

arch/arc/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

syscall-y += syscall_table_32.h



generic-y += extable.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

arch/arc/include/asm/unistd.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_ARC_UNISTD_H

#define _ASM_ARC_UNISTD_H



#include <uapi/asm/unistd.h>



#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK



#define NR_syscalls __NR_syscalls



#endif

arch/arc/include/uapi/asm/Kbuild

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

syscall-y += unistd_32.h



generic-y += ucontext.h

arch/arc/include/uapi/asm/unistd.h

+1 −43
Original line number Diff line number Diff line
@@ -7,46 +7,4 @@ 
 * published by the Free Software Foundation.

 */



/******** no-legacy-syscalls-ABI *******/



/*

 * Non-typical guard macro to enable inclusion twice in ARCH sys.c

 * That is how the Generic syscall wrapper generator works

 */

#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL)

#define _UAPI_ASM_ARC_UNISTD_H



#define __ARCH_WANT_RENAMEAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_CLONE3

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS



#define sys_mmap2 sys_mmap_pgoff



#include <asm-generic/unistd.h>



#define NR_syscalls	__NR_syscalls



/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */

#define __NR_sysfs		(__NR_arch_specific_syscall + 3)



/* ARC specific syscall */

#define __NR_cacheflush		(__NR_arch_specific_syscall + 0)

#define __NR_arc_settls		(__NR_arch_specific_syscall + 1)

#define __NR_arc_gettls		(__NR_arch_specific_syscall + 2)

#define __NR_arc_usr_cmpxchg	(__NR_arch_specific_syscall + 4)



__SYSCALL(__NR_cacheflush, sys_cacheflush)

__SYSCALL(__NR_arc_settls, sys_arc_settls)

__SYSCALL(__NR_arc_gettls, sys_arc_gettls)

__SYSCALL(__NR_arc_usr_cmpxchg, sys_arc_usr_cmpxchg)

__SYSCALL(__NR_sysfs, sys_sysfs)



#undef __SYSCALL



#endif
 
#include <asm/unistd_32.h>