lkml.org 
[lkml]   [2012]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:x86/x32] x32: Provide separate is_ia32_task() and is_x32_task () predicates
Commit-ID:  a628b684d27d22631d1819890f13047ae9075241
Gitweb: http://git.kernel.org/tip/a628b684d27d22631d1819890f13047ae9075241
Author: H. Peter Anvin <hpa@zytor.com>
AuthorDate: Mon, 5 Mar 2012 13:39:29 -0800
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 5 Mar 2012 15:35:18 -0800

x32: Provide separate is_ia32_task() and is_x32_task() predicates

The is_compat_task() test is composed of two predicates already, so
make each of them available separately.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: H. J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1329696488-16970-1-git-send-email-hpa@zytor.com
---
arch/x86/include/asm/compat.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index e7f68b4..355edc0 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -235,12 +235,17 @@ static inline void __user *arch_compat_alloc_user_space(long len)
return (void __user *)round_down(sp - len, 16);
}

-static inline bool is_compat_task(void)
+static inline bool is_ia32_task(void)
{
#ifdef CONFIG_IA32_EMULATION
if (current_thread_info()->status & TS_COMPAT)
return true;
#endif
+ return false;
+}
+
+static inline bool is_x32_task(void)
+{
#ifdef CONFIG_X86_X32_ABI
if (task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT)
return true;
@@ -248,4 +253,9 @@ static inline bool is_compat_task(void)
return false;
}

+static inline bool is_compat_task(void)
+{
+ return is_ia32_task() || is_x32_task();
+}
+
#endif /* _ASM_X86_COMPAT_H */

\
 
 \ /
  Last update: 2012-03-06 01:59    [W:0.381 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site