diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-18 18:41:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-18 18:41:12 +0200 |
| commit | f594d0b9b34aeb8e3ffa524eaa8a4085afb56d22 (patch) | |
| tree | 7ef81ad042bcfe78dc0f41e05cebfdbc268871c4 /arch/sh/include/uapi/asm/cpu-features.h | |
| parent | b3830e8d478cd9fe33e820425ce431c8ef280967 (diff) | |
| parent | 7b0501b1e7cddd32b265178e32d332bdfbb532d4 (diff) | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/include/uapi/asm/cpu-features.h')
| -rw-r--r-- | arch/sh/include/uapi/asm/cpu-features.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/uapi/asm/cpu-features.h b/arch/sh/include/uapi/asm/cpu-features.h index 694abe490edb..2f1bc851042a 100644 --- a/arch/sh/include/uapi/asm/cpu-features.h +++ b/arch/sh/include/uapi/asm/cpu-features.h @@ -22,5 +22,6 @@ #define CPU_HAS_L2_CACHE 0x0080 /* Secondary cache / URAM */ #define CPU_HAS_OP32 0x0100 /* 32-bit instruction support */ #define CPU_HAS_PTEAEX 0x0200 /* PTE ASID Extension support */ +#define CPU_HAS_CAS_L 0x0400 /* cas.l atomic compare-and-swap */ #endif /* __ASM_SH_CPU_FEATURES_H */ |