diff options
Diffstat (limited to 'arch/powerpc/include/asm/thread_info.h')
| -rw-r--r-- | arch/powerpc/include/asm/thread_info.h | 20 | 
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index ba7b1973866..b034ecdb7c7 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h @@ -82,8 +82,6 @@ static inline struct thread_info *current_thread_info(void)  #endif /* __ASSEMBLY__ */ -#define PREEMPT_ACTIVE		0x10000000 -  /*   * thread information flag bit numbers   */ @@ -93,8 +91,7 @@ static inline struct thread_info *current_thread_info(void)  #define TIF_POLLING_NRFLAG	3	/* true if poll_idle() is polling  					   TIF_NEED_RESCHED */  #define TIF_32BIT		4	/* 32 bit binary */ -#define TIF_PERFMON_WORK	5	/* work for pfm_handle_work() */ -#define TIF_PERFMON_CTXSW	6	/* perfmon needs ctxsw calls */ +#define TIF_RESTORE_TM		5	/* need to restore TM FP/VEC/VSX */  #define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */  #define TIF_SINGLESTEP		8	/* singlestepping active */  #define TIF_NOHZ		9	/* in adaptive nohz mode */ @@ -107,6 +104,9 @@ static inline struct thread_info *current_thread_info(void)  #define TIF_EMULATE_STACK_STORE	16	/* Is an instruction emulation  						for stack store? */  #define TIF_MEMDIE		17	/* is terminating due to OOM killer */ +#if defined(CONFIG_PPC64) +#define TIF_ELF2ABI		18	/* function descriptors must die! */ +#endif  /* as above, but as bit values */  #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE) @@ -114,8 +114,7 @@ static inline struct thread_info *current_thread_info(void)  #define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)  #define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)  #define _TIF_32BIT		(1<<TIF_32BIT) -#define _TIF_PERFMON_WORK	(1<<TIF_PERFMON_WORK) -#define _TIF_PERFMON_CTXSW	(1<<TIF_PERFMON_CTXSW) +#define _TIF_RESTORE_TM		(1<<TIF_RESTORE_TM)  #define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)  #define _TIF_SINGLESTEP		(1<<TIF_SINGLESTEP)  #define _TIF_SECCOMP		(1<<TIF_SECCOMP) @@ -131,7 +130,8 @@ static inline struct thread_info *current_thread_info(void)  				 _TIF_NOHZ)  #define _TIF_USER_WORK_MASK	(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ -				 _TIF_NOTIFY_RESUME | _TIF_UPROBE) +				 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \ +				 _TIF_RESTORE_TM)  #define _TIF_PERSYSCALL_MASK	(_TIF_RESTOREALL|_TIF_NOERROR)  /* Bits in local_flags */ @@ -185,6 +185,12 @@ static inline bool test_thread_local_flags(unsigned int flags)  #define is_32bit_task()	(1)  #endif +#if defined(CONFIG_PPC64) +#define is_elf2_task() (test_thread_flag(TIF_ELF2ABI)) +#else +#define is_elf2_task() (0) +#endif +  #endif	/* !__ASSEMBLY__ */  #endif /* __KERNEL__ */  | 
