[linux] 01/01: [x86] Fix visiblity of x32_enabled in x32 conditional syscall patch

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 5539892a39ff24fb6fe64f713ffd0ed16e3a7ac0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Apr 14 18:27:07 2016 +0100

    [x86] Fix visiblity of x32_enabled in x32 conditional syscall patch
    
    Since it's now used in arch/x86/entry/common.c, move the declaration
    to <asm/syscall.h>.
---
 .../x86-make-x32-syscall-support-conditional.patch | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 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 77f0128..b615787 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
@@ -58,20 +58,15 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
  	depends on IA32_EMULATION || X86_X32
 --- a/arch/x86/include/asm/elf.h
 +++ b/arch/x86/include/asm/elf.h
-@@ -154,6 +154,12 @@ do {						\
+@@ -9,6 +9,7 @@
+ #include <asm/ptrace.h>
+ #include <asm/user.h>
+ #include <asm/auxvec.h>
++#include <asm/syscall.h>
  
- #else /* CONFIG_X86_32 */
+ typedef unsigned long elf_greg_t;
  
-+#ifdef CONFIG_X86_X32_ABI
-+extern bool x32_enabled;
-+#else
-+#define x32_enabled 0
-+#endif
-+
- /*
-  * This is used to ensure we don't load something for the wrong architecture.
-  */
-@@ -162,7 +168,7 @@ do {						\
+@@ -162,7 +163,7 @@ do {						\
  
  #define compat_elf_check_arch(x)					\
  	(elf_check_arch_ia32(x) ||					\
@@ -200,3 +195,18 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
  			regs->di, regs->si, regs->dx,
  			regs->r10, regs->r8, regs->r9);
  	}
+--- a/arch/x86/include/asm/syscall.h
++++ b/arch/x86/include/asm/syscall.h
+@@ -35,6 +35,12 @@ extern const sys_call_ptr_t sys_call_tab
+ extern const sys_call_ptr_t ia32_sys_call_table[];
+ #endif
+ 
++#if defined(CONFIG_X86_X32_ABI)
++extern bool x32_enabled;
++#else
++#define x32_enabled 0
++#endif
++
+ /*
+  * Only the low 32 bits of orig_ax are meaningful, so we return int.
+  * This importantly ignores the high bits on 64-bit, so comparisons

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git