diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/blackfin/include/asm/entry.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/blackfin/include/asm/entry.h')
| -rw-r--r-- | arch/blackfin/include/asm/entry.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/blackfin/include/asm/entry.h b/arch/blackfin/include/asm/entry.h index a6886f6e4819..4104d5783e2c 100644 --- a/arch/blackfin/include/asm/entry.h +++ b/arch/blackfin/include/asm/entry.h | |||
| @@ -15,14 +15,6 @@ | |||
| 15 | #define LFLUSH_I_AND_D 0x00000808 | 15 | #define LFLUSH_I_AND_D 0x00000808 |
| 16 | #define LSIGTRAP 5 | 16 | #define LSIGTRAP 5 |
| 17 | 17 | ||
| 18 | /* process bits for task_struct.flags */ | ||
| 19 | #define PF_TRACESYS_OFF 3 | ||
| 20 | #define PF_TRACESYS_BIT 5 | ||
| 21 | #define PF_PTRACED_OFF 3 | ||
| 22 | #define PF_PTRACED_BIT 4 | ||
| 23 | #define PF_DTRACE_OFF 1 | ||
| 24 | #define PF_DTRACE_BIT 5 | ||
| 25 | |||
| 26 | /* | 18 | /* |
| 27 | * NOTE! The single-stepping code assumes that all interrupt handlers | 19 | * NOTE! The single-stepping code assumes that all interrupt handlers |
| 28 | * start by saving SYSCFG on the stack with their first instruction. | 20 | * start by saving SYSCFG on the stack with their first instruction. |