diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 06:19:52 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 06:19:52 -0400 |
| commit | 4210606b19852dce52ed1a687db816695b6048e1 (patch) | |
| tree | fd0762f88dc54560d87fc1e523741d92228f6a9c /arch/s390/include/asm/processor.h | |
| parent | 4d8cfa4642f7d8fafa4d60f05dd34fe8c3b9fa45 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'arch/s390/include/asm/processor.h')
| -rw-r--r-- | arch/s390/include/asm/processor.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 6b499870662f..b0e6435b2f02 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h | |||
| @@ -91,7 +91,15 @@ struct thread_struct { | |||
| 91 | #endif | 91 | #endif |
| 92 | }; | 92 | }; |
| 93 | 93 | ||
| 94 | #define PER_FLAG_NO_TE 1UL /* Flag to disable transactions. */ | 94 | /* Flag to disable transactions. */ |
| 95 | #define PER_FLAG_NO_TE 1UL | ||
| 96 | /* Flag to enable random transaction aborts. */ | ||
| 97 | #define PER_FLAG_TE_ABORT_RAND 2UL | ||
| 98 | /* Flag to specify random transaction abort mode: | ||
| 99 | * - abort each transaction at a random instruction before TEND if set. | ||
| 100 | * - abort random transactions at a random instruction if cleared. | ||
| 101 | */ | ||
| 102 | #define PER_FLAG_TE_ABORT_RAND_TEND 4UL | ||
| 95 | 103 | ||
| 96 | typedef struct thread_struct thread_struct; | 104 | typedef struct thread_struct thread_struct; |
| 97 | 105 | ||