diff options
| author | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
|---|---|---|
| committer | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
| commit | ebb688e3183bd5891312bdb8f4e2f520d70b36b6 (patch) | |
| tree | c30d1abefaccc8cd1baa4944aae3348668e13bde /arch/cris/include/asm/thread_info.h | |
| parent | 8061f3a885ec3538bf405ff3957c205b1ab2aae4 (diff) | |
| parent | b2afcd30fff4c24290a63a2497de301864d9726d (diff) | |
Merge remote branch 'lttng/2.6.38-lttng-0.247'
Conflicts:
arch/arm/kernel/traps.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/cris/include/asm/thread_info.h')
| -rw-r--r-- | arch/cris/include/asm/thread_info.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/cris/include/asm/thread_info.h b/arch/cris/include/asm/thread_info.h index 91776069ca8..bc2024dbe32 100644 --- a/arch/cris/include/asm/thread_info.h +++ b/arch/cris/include/asm/thread_info.h @@ -83,6 +83,7 @@ struct thread_info { #define TIF_NOTIFY_RESUME 1 /* resumption notification requested */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ +#define TIF_KERNEL_TRACE 4 /* kernel trace active */ #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_MEMDIE 17 /* is terminating due to OOM killer */ @@ -92,12 +93,16 @@ struct thread_info { #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) +#define _TIF_KERNEL_TRACE (1<<TIF_KERNEL_TRACE) #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) #define _TIF_FREEZE (1<<TIF_FREEZE) -#define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ -#define _TIF_ALLWORK_MASK 0x0000FFFF /* work to do on any return to u-space */ +/* work to do on interrupt/exception return */ +#define _TIF_WORK_MASK 0x0000FFFF & \ + (~_TIF_SYSCALL_TRACE | ~_TIF_KERNEL_TRACE) +/* work to do on any return to u-space */ +#define _TIF_ALLWORK_MASK 0x0000FFFF #endif /* __KERNEL__ */ |