Merge tag 'asm-generic-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Nov 2023 01:28:33 +0000 (15:28 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Nov 2023 01:28:33 +0000 (15:28 -1000)
Pull ia64 removal and asm-generic updates from Arnd Bergmann:

 - The ia64 architecture gets its well-earned retirement as planned,
   now that there is one last (mostly) working release that will be
   maintained as an LTS kernel.

 - The architecture specific system call tables are updated for the
   added map_shadow_stack() syscall and to remove references to the
   long-gone sys_lookup_dcookie() syscall.

* tag 'asm-generic-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  hexagon: Remove unusable symbols from the ptrace.h uapi
  asm-generic: Fix spelling of architecture
  arch: Reserve map_shadow_stack() syscall number for all architectures
  syscalls: Cleanup references to sys_lookup_dcookie()
  Documentation: Drop or replace remaining mentions of IA64
  lib/raid6: Drop IA64 support
  Documentation: Drop IA64 from feature descriptions
  kernel: Drop IA64 support from sig_fault handlers
  arch: Remove Itanium (IA-64) architecture

45 files changed:
1  2 
Documentation/admin-guide/kernel-parameters.txt
Documentation/admin-guide/sysctl/kernel.rst
MAINTAINERS
Makefile
arch/alpha/kernel/syscalls/syscall.tbl
arch/arm/tools/syscall.tbl
arch/arm64/include/asm/unistd32.h
arch/m68k/kernel/syscalls/syscall.tbl
arch/microblaze/kernel/syscalls/syscall.tbl
arch/mips/kernel/syscalls/syscall_n32.tbl
arch/mips/kernel/syscalls/syscall_n64.tbl
arch/mips/kernel/syscalls/syscall_o32.tbl
arch/parisc/kernel/syscalls/syscall.tbl
arch/powerpc/kernel/syscalls/syscall.tbl
arch/s390/kernel/syscalls/syscall.tbl
arch/sh/kernel/syscalls/syscall.tbl
arch/sparc/kernel/syscalls/syscall.tbl
arch/x86/entry/syscalls/syscall_32.tbl
arch/x86/entry/syscalls/syscall_64.tbl
arch/xtensa/kernel/syscalls/syscall.tbl
drivers/acpi/osl.c
drivers/firmware/Kconfig
drivers/firmware/Makefile
drivers/firmware/efi/efi.c
drivers/net/ethernet/broadcom/tg3.c
drivers/video/fbdev/Kconfig
fs/Kconfig
include/linux/acpi.h
include/linux/mm.h
include/linux/sched/signal.h
include/linux/syscalls.h
include/uapi/asm-generic/unistd.h
kernel/cpu.c
kernel/fork.c
kernel/sched/core.c
kernel/signal.c
kernel/sys_ni.c
kernel/sysctl.c
lib/Kconfig.debug
mm/mmap.c
tools/include/uapi/asm-generic/unistd.h
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
tools/perf/arch/s390/entry/syscalls/syscall.tbl
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
index b68f1f56b8366b38b7c4bc81a6ee1020ede01d4a,5d05ab716a748c7f83d6c657f600da9cc57485f7..18c842ca6c32c1eee80d8bb4c55b2b9d9e9cc8a3
  560   common  set_mempolicy_home_node         sys_ni_syscall
  561   common  cachestat                       sys_cachestat
  562   common  fchmodat2                       sys_fchmodat2
- # 563 reserved for map_shadow_stack
+ 563   common  map_shadow_stack                sys_map_shadow_stack
 +564   common  futex_wake                      sys_futex_wake
 +565   common  futex_wait                      sys_futex_wait
 +566   common  futex_requeue                   sys_futex_requeue
index 93d0d46cbb15ab85b5f2e31c17a701084859c71c,45ec6e1dc87207dea030bccf4f9b95b987145b31..584f9528c99644d1b10511d06acd03a72d7d4637
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index c453291154fde6025df96b455a3d26168cbbf35b,0774d9cbe56327b2435c2ff87b5db765ab63a47b..9f7c1bf99526797367f4197ab6a434abaf02eb73
@@@ -911,12 -911,8 +911,14 @@@ __SYSCALL(__NR_set_mempolicy_home_node
  __SYSCALL(__NR_cachestat, sys_cachestat)
  #define __NR_fchmodat2 452
  __SYSCALL(__NR_fchmodat2, sys_fchmodat2)
+ #define __NR_map_shadow_stack 453
+ __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack)
 +#define __NR_futex_wake 454
 +__SYSCALL(__NR_futex_wake, sys_futex_wake)
 +#define __NR_futex_wait 455
 +__SYSCALL(__NR_futex_wait, sys_futex_wait)
 +#define __NR_futex_requeue 456
 +__SYSCALL(__NR_futex_requeue, sys_futex_requeue)
  
  /*
   * Please add new compat syscalls above this comment and update
index f7f997a88bab56a54f6fa1dbdfaa9892bea4bd35,12d0ce43b094fd630acb9e1f7d58d3daa91eed77..7a4b780e82cbdc9f4bec452159ce95537c5997c5
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index 2967ec26b9781ff4fc33538ecf88db1ad7c7e77d,de8219c4300c8dcf09b7c3ee8aa95e58b6873c67..5b6a0b02b7de0ad46704c99d8c533961df19a0ba
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index 383abb1713f4432dfea5763554337a87e219dab3,a5096a064fb4241052f2304e5da1400d5facd0a0..a842b41c8e064cf76e7e7a6b49a448b85885721a
  450   n32     set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   n32     cachestat                       sys_cachestat
  452   n32     fchmodat2                       sys_fchmodat2
+ 453   n32     map_shadow_stack                sys_map_shadow_stack
 +454   n32     futex_wake                      sys_futex_wake
 +455   n32     futex_wait                      sys_futex_wait
 +456   n32     futex_requeue                   sys_futex_requeue
index c9bd09ba905f172af03b6e6cb376f9897c40e3a1,0044031d9c7001d2883ab2097a8969b3b21b44fc..116ff501bf9263ac82a184e4fa408205e52292dd
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   n64     cachestat                       sys_cachestat
  452   n64     fchmodat2                       sys_fchmodat2
+ 453   n64     map_shadow_stack                sys_map_shadow_stack
 +454   n64     futex_wake                      sys_futex_wake
 +455   n64     futex_wait                      sys_futex_wait
 +456   n64     futex_requeue                   sys_futex_requeue
index ba5ef6cea97a56506c1adff8a8037ed67eea94eb,cf44a6ac38fac6ce5a36c229a3708f0f8e301fc0..525cc54bc63bf729cd82f82b52e8f8b8683bc7b6
  450   o32     set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   o32     cachestat                       sys_cachestat
  452   o32     fchmodat2                       sys_fchmodat2
+ 453   o32     map_shadow_stack                sys_map_shadow_stack
 +454   o32     futex_wake                      sys_futex_wake
 +455   o32     futex_wait                      sys_futex_wait
 +456   o32     futex_requeue                   sys_futex_requeue
index 9f0f6df55361d8dc3db43b7f6b6b13dc628f1b59,4048ed480a04183f101008989b70d7f54431573a..a47798fed54e392943dea454ab59a3b00189c244
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index 26fc41904266295a700d1432cfaac6088b717067,d845e14c38f31efd1cb5073e49e32b337df3de65..7fab411378f2dd7dda7b136e8fec9b28186e0fea
  450   nospu   set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_ni_syscall
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index 31be90b241f7e838e65a379df195574e7e672ff6,416645f1c1fbf95b73fd116fa77f5edf9ed0c79c..86fec9b080f61bd0a5ef09395649cf15a9c90502
  450  common   set_mempolicy_home_node sys_set_mempolicy_home_node     sys_set_mempolicy_home_node
  451  common   cachestat               sys_cachestat                   sys_cachestat
  452  common   fchmodat2               sys_fchmodat2                   sys_fchmodat2
- 456  common   futex_requeue           sys_futex_requeue                       sys_futex_requeue
+ 453  common   map_shadow_stack        sys_map_shadow_stack            sys_map_shadow_stack
 +454  common   futex_wake              sys_futex_wake                  sys_futex_wake
 +455  common   futex_wait              sys_futex_wait                  sys_futex_wait
++456  common   futex_requeue           sys_futex_requeue               sys_futex_requeue
index 4bc5d488ab178a602f3a5f5aefd2e4fd0ff2f390,bf36587b87b5ecd5709f4178ab92b342e22cee1a..363fae0fe9bf4860a23f3e091980797f60c3d7c9
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index 8404c8e50394d906c237920a6b500f46131db3bc,f45f8c5ed076854b99d727a0984fce720e4e545b..7bcaa3d5ea442efd473e881932ac4b769222ff8f
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
index 31c48bc2c3d8663bda2cefef37adf17393faec91,54748f6d7c45177ac98b9056990c7b59601a723b..c8fac520580353dd7350fbc6ad61963042db4eb8
  450   i386    set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   i386    cachestat               sys_cachestat
  452   i386    fchmodat2               sys_fchmodat2
+ 453   i386    map_shadow_stack        sys_map_shadow_stack
 +454   i386    futex_wake              sys_futex_wake
 +455   i386    futex_wait              sys_futex_wait
 +456   i386    futex_requeue           sys_futex_requeue
index dd71ecce8b86e217d65222041d52f7cb1d447285,10a7eecbedf097fb8134fd89ac1c4d47a3ad8998..06eefa9c1458863a316d7273daf0463a6a4db075
  450   common  set_mempolicy_home_node         sys_set_mempolicy_home_node
  451   common  cachestat                       sys_cachestat
  452   common  fchmodat2                       sys_fchmodat2
+ 453   common  map_shadow_stack                sys_map_shadow_stack
 +454   common  futex_wake                      sys_futex_wake
 +455   common  futex_wait                      sys_futex_wait
 +456   common  futex_requeue                   sys_futex_requeue
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d9e9cd13e577454229bdfe631732ee76c4855387,00df5af71ca134568991874a8b3d18c008d215a5..756b013fb8324bd7a320e60cebec2ca692faa149
@@@ -816,21 -816,18 +816,21 @@@ __SYSCALL(__NR_process_mrelease, sys_pr
  __SYSCALL(__NR_futex_waitv, sys_futex_waitv)
  #define __NR_set_mempolicy_home_node 450
  __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node)
--
  #define __NR_cachestat 451
  __SYSCALL(__NR_cachestat, sys_cachestat)
--
  #define __NR_fchmodat2 452
  __SYSCALL(__NR_fchmodat2, sys_fchmodat2)
 -
+ #define __NR_map_shadow_stack 453
+ __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack)
 +#define __NR_futex_wake 454
 +__SYSCALL(__NR_futex_wake, sys_futex_wake)
 +#define __NR_futex_wait 455
 +__SYSCALL(__NR_futex_wait, sys_futex_wait)
 +#define __NR_futex_requeue 456
 +__SYSCALL(__NR_futex_requeue, sys_futex_requeue)
  
  #undef __NR_syscalls
 -#define __NR_syscalls 454
 +#define __NR_syscalls 457
  
  /*
   * 32 bit systems traditionally used different
diff --cc kernel/cpu.c
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
diff --cc kernel/signal.c
Simple merge
diff --cc kernel/sys_ni.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge