TileOS/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refresh patches

Browse source
This commit is contained in:
Aleksey Samoilov 2024-06-15 00:10:45 +04:00
parent 76157e76b1
commit 60e35759c4
Signed by: Sunderland93
GPG key ID: D3E730685C28F1FB
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch vendored
View file

@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6172,6 +6172,10 @@ @@ -5768,6 +5768,10 @@
later by a loaded module cannot be set this way. later by a loaded module cannot be set this way.
Example: sysctl.vm.swappiness=40 Example: sysctl.vm.swappiness=40
@ -37,12 +37,12 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+ an x86_64 kernel where CONFIG_X86_X32 is enabled. + an x86_64 kernel where CONFIG_X86_X32 is enabled.
+ Default depends on CONFIG_X86_X32_DISABLED. + Default depends on CONFIG_X86_X32_DISABLED.
+ +
sysrq_always_enabled sysfs.deprecated=0|1 [KNL]
[KNL] Enable/disable old style sysfs layout for old udev
Ignore sysrq setting - this boot parameter will on older distributions. When this option is enabled
--- a/arch/x86/Kconfig --- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig +++ b/arch/x86/Kconfig
@@ -3058,6 +3058,14 @@ config COMPAT_32 @@ -2865,6 +2865,14 @@ config COMPAT_32
select HAVE_UID16 select HAVE_UID16
select OLD_SIGSUSPEND3 select OLD_SIGSUSPEND3
@ -139,7 +139,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
typedef unsigned long elf_greg_t; typedef unsigned long elf_greg_t;
@@ -150,7 +153,8 @@ do { \ @@ -161,7 +164,8 @@ do { \
#define compat_elf_check_arch(x) \ #define compat_elf_check_arch(x) \
(elf_check_arch_ia32(x) || \ (elf_check_arch_ia32(x) || \
@ -147,8 +147,8 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+ (IS_ENABLED(CONFIG_X86_X32_ABI) && x32_enabled && \ + (IS_ENABLED(CONFIG_X86_X32_ABI) && x32_enabled && \
+ (x)->e_machine == EM_X86_64)) + (x)->e_machine == EM_X86_64))
static inline void elf_common_init(struct thread_struct *t, #if __USER32_DS != __USER_DS
struct pt_regs *regs, const u16 ds) # error "The following code assumes __USER32_DS == __USER_DS"
--- a/arch/x86/include/asm/syscall.h --- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@