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

Commit 507413a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull arch/sh syscall table scripting from Arnd Bergmann:
 "I worked with Firoz Khan to change all architectures to have their
  system call tables (syscall.S and asm/unistd.h) generated by a script
  from a more readable input file the same way that we already had on
  x86, s390 and arm.

  I offered to take those conversions through the asm-generic tree that
  did not get picked up by the architecture maintainers, and fortunately
  all but one have now been accepted into arch maintainer trees, so this
  branch only contains the conversion for arch/sh/, with permission from
  Rich.

  The conversion does not include the old 64-bit sh5 architecture, which
  has never shipped and not even compiled in a long time. The table in
  include/uapi/asm/unistd.h is also not included here, as Firoz is still
  working on that one, it will have to wait for the next following merge
  window, hopefully together with the addition of the 64-bit time_t
  system calls for the y2038 work that led to the system call table
  rework"

* tag 'asm-generic-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  sh: generate uapi header and syscall table header files
  sh: add system call table generation support
  sh: add __NR_syscalls along with NR_syscalls
parents 9947ab7b 2b3c5a99

arch/sh/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,9 @@ archclean: 
	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall



archheaders:

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



define archhelp

	@echo '  zImage 	           - Compressed kernel image'

	@echo '  romImage	           - Compressed ROM image, if supported'

arch/sh/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
generated-y += syscall_table.h

generic-y += compat.h

generic-y += current.h

generic-y += delay.h

arch/sh/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#  include <asm/unistd_64.h>

# endif



#define NR_syscalls	__NR_syscalls



# define __ARCH_WANT_NEW_STAT

# define __ARCH_WANT_OLD_READDIR

# define __ARCH_WANT_OLD_STAT

arch/sh/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 += bitsperlong.h

generic-y += bpf_perf_event.h

generic-y += errno.h

arch/sh/include/uapi/asm/unistd_32.h

+3 −1
Original line number Diff line number Diff line
@@ -396,6 +396,8 @@ 
#define __NR_preadv2		381

#define __NR_pwritev2		382



#define NR_syscalls 383

#ifdef __KERNEL__

#define __NR_syscalls		383

#endif



#endif /* __ASM_SH_UNISTD_32_H */