In "x86: Make x32 syscall support conditional on a kernel parameter", update dependency from X86_X32 to X86_X32_ABI

1 files changed, 16 insertions, 28 deletions

diff --git a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
index 574bb0c5e..44dd25261 100644
--- a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
+++ b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
@@ -27,11 +27,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  arch/x86/include/asm/syscall.h                | 13 ++++++
  6 files changed, 78 insertions(+), 2 deletions(-)
 
-Index: linux/Documentation/admin-guide/kernel-parameters.txt
-===================================================================
---- linux.orig/Documentation/admin-guide/kernel-parameters.txt
-+++ linux/Documentation/admin-guide/kernel-parameters.txt
-@@ -5539,6 +5539,10 @@
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -5768,6 +5768,10 @@
  			later by a loaded module cannot be set this way.
  			Example: sysctl.vm.swappiness=40
  
@@ -42,17 +40,15 @@ Index: linux/Documentation/admin-guide/kernel-parameters.txt
  	sysfs.deprecated=0|1 [KNL]
  			Enable/disable old style sysfs layout for old udev
  			on older distributions. When this option is enabled
-Index: linux/arch/x86/Kconfig
-===================================================================
---- linux.orig/arch/x86/Kconfig
-+++ linux/arch/x86/Kconfig
-@@ -2834,6 +2834,14 @@ config COMPAT_32
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2865,6 +2865,14 @@ config COMPAT_32
  	select HAVE_UID16
  	select OLD_SIGSUSPEND3
  
 +config X86_X32_DISABLED
 +	bool "x32 ABI disabled by default"
-+	depends on X86_X32
++	depends on X86_X32_ABI
 +	default n
 +	help
 +	  Disable the x32 ABI unless explicitly enabled using the
@@ -60,11 +56,9 @@ Index: linux/arch/x86/Kconfig
 +
  config COMPAT
  	def_bool y
- 	depends on IA32_EMULATION || X86_X32
-Index: linux/arch/x86/entry/common.c
-===================================================================
---- linux.orig/arch/x86/entry/common.c
-+++ linux/arch/x86/entry/common.c
+ 	depends on IA32_EMULATION || X86_X32_ABI
+--- a/arch/x86/entry/common.c
++++ b/arch/x86/entry/common.c
 @@ -62,7 +62,7 @@ static __always_inline bool do_syscall_x
  	 */
  	unsigned int xnr = nr - __X32_SYSCALL_BIT;
@@ -74,10 +68,8 @@ Index: linux/arch/x86/entry/common.c
  		xnr = array_index_nospec(xnr, X32_NR_syscalls);
  		regs->ax = x32_sys_call_table[xnr](regs);
  		return true;
-Index: linux/arch/x86/entry/syscall_x32.c
-===================================================================
---- linux.orig/arch/x86/entry/syscall_x32.c
-+++ linux/arch/x86/entry/syscall_x32.c
+--- a/arch/x86/entry/syscall_x32.c
++++ b/arch/x86/entry/syscall_x32.c
 @@ -4,6 +4,9 @@
  #include <linux/linkage.h>
  #include <linux/sys.h>
@@ -135,10 +127,8 @@ Index: linux/arch/x86/entry/syscall_x32.c
 +};
 +
 +arch_param_cb(x32, &x32_param_ops, NULL, 0444);
-Index: linux/arch/x86/include/asm/elf.h
-===================================================================
---- linux.orig/arch/x86/include/asm/elf.h
-+++ linux/arch/x86/include/asm/elf.h
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
 @@ -11,6 +11,9 @@
  #include <asm/user.h>
  #include <asm/auxvec.h>
@@ -159,10 +149,8 @@ Index: linux/arch/x86/include/asm/elf.h
  
  #if __USER32_DS != __USER_DS
  # error "The following code assumes __USER32_DS == __USER_DS"
-Index: linux/arch/x86/include/asm/syscall.h
-===================================================================
---- linux.orig/arch/x86/include/asm/syscall.h
-+++ linux/arch/x86/include/asm/syscall.h
+--- a/arch/x86/include/asm/syscall.h
++++ b/arch/x86/include/asm/syscall.h
 @@ -13,6 +13,7 @@
  #include <uapi/linux/audit.h>
  #include <linux/sched.h>