Commit f12e840c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha 

Pull alpha architecture updates from Matt Turner:
 "A few small changes for alpha as well as the new system call table
  generation support from Firoz Khan"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: Remove some unused variables
  alpha: rtc: simplify alpha_rtc_init
  alpha: Fix a typo on ptrace.h
  alpha: fix spelling mistake QSD_PORT_ACTUVE -> QSD_PORT_ACTIVE
  alpha: generate uapi header and syscall table header files
  alpha: add system call table generation support
  alpha: add __NR_syscalls along with NR_SYSCALLS
  alpha: remove CONFIG_OSF4_COMPAT flag from syscall table
  alpha: move __IGNORE* entries to non uapi header
parents e3ed513b 1c3243f6

arch/alpha/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ bootimage bootpfile bootpzfile: vmlinux 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



archheaders:

	$(Q)$(MAKE) $(build)=arch/alpha/kernel/syscalls all



define archhelp

  echo '* boot		- Compressed kernel image (arch/alpha/boot/vmlinux.gz)'

  echo '  bootimage	- SRM bootable image (arch/alpha/boot/bootimage)'

arch/alpha/include/asm/Kbuild

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





generated-y += syscall_table.h

generic-y += compat.h

generic-y += exec.h

generic-y += export.h

arch/alpha/include/asm/unistd.h

+22 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <uapi/asm/unistd.h>



#define NR_SYSCALLS			523

#define NR_SYSCALLS	__NR_syscalls



#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_OLD_READDIR
@@ -19,4 +19,25 @@ 
#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_CLONE



/*

 * Ignore legacy syscalls that we don't use.

 */

#define __IGNORE_alarm

#define __IGNORE_creat

#define __IGNORE_getegid

#define __IGNORE_geteuid

#define __IGNORE_getgid

#define __IGNORE_getpid

#define __IGNORE_getppid

#define __IGNORE_getuid

#define __IGNORE_pause

#define __IGNORE_time

#define __IGNORE_utime

#define __IGNORE_umount2



/* Alpha doesn't have protection keys. */

#define __IGNORE_pkey_mprotect

#define __IGNORE_pkey_alloc

#define __IGNORE_pkey_free



#endif /* _ALPHA_UNISTD_H */

arch/alpha/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generated-y += unistd_32.h

generic-y += bpf_perf_event.h

generic-y += ipcbuf.h

generic-y += msgbuf.h

arch/alpha/include/uapi/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * kernel stack during a system call or other kernel entry

 *

 * NOTE! I want to minimize the overhead of system calls, so this

 * struct has as little information as possible.  I does not have

 * struct has as little information as possible. It does not have

 *

 *  - floating point regs: the kernel doesn't change those

 *  - r9-15: saved by the C compiler

CRA Git | Maintained and supported by SUSTech CRA and CCSE