Skip to content

Commit

Permalink
sparc: implement is_32bit_task
Browse files Browse the repository at this point in the history
We are currently embedding the same check from thread_info.h into
syscall.h thanks to the way syscall_get_arch() was implemented in the
audit tree.  Instead create a new function, is_32bit_task() which is
similar to that found on the powerpc arch.  This simplifies the
syscall.h code and makes the build/Kconfig requirements much easier
to understand.

Signed-off-by: Eric Paris <eparis@redhat.com
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: sparclinux@vger.kernel.org
  • Loading branch information
Eric Paris committed Sep 23, 2014
1 parent 01ed102 commit a17c8b5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
7 changes: 1 addition & 6 deletions arch/sparc/include/asm/syscall.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,7 @@ static inline void syscall_set_arguments(struct task_struct *task,

static inline int syscall_get_arch(void)
{
#if defined(__sparc__) && defined(__arch64__)
return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
: AUDIT_ARCH_SPARC64;
#else
return AUDIT_ARCH_SPARC;
#endif
return is_32bit_task() ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64;
}

#endif /* __ASM_SPARC_SYSCALL_H */
2 changes: 2 additions & 0 deletions arch/sparc/include/asm/thread_info_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \
_TIF_SIGPENDING)

#define is_32bit_task() (1)

#endif /* __KERNEL__ */

#endif /* _ASM_THREAD_INFO_H */
2 changes: 2 additions & 0 deletions arch/sparc/include/asm/thread_info_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
_TIF_NEED_RESCHED)
#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)

#define is_32bit_task() (test_thread_flag(TIF_32BIT))

/*
* Thread-synchronous status.
*
Expand Down

0 comments on commit a17c8b5

Please sign in to comment.