diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-21 04:57:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-21 04:57:33 -0400 |
| commit | 73e21ce28d8d2b75140b742b01373c3a085ecc52 (patch) | |
| tree | add380154271f9a68be4099590f912b4ab4bed9f /arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h | |
| parent | b5210b2a34bae35fc00675462333af45676d727c (diff) | |
| parent | f1923820c447e986a9da0fc6bf60c1dccdf0408e (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event_intel.c
Merge in the latest fixes before applying new patches, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h')
| -rw-r--r-- | arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h b/arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h index d9c828419037..193c0912d38e 100644 --- a/arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h | |||
| @@ -28,11 +28,7 @@ | |||
| 28 | /* #define cpu_has_prefetch ? */ | 28 | /* #define cpu_has_prefetch ? */ |
| 29 | #define cpu_has_mcheck 1 | 29 | #define cpu_has_mcheck 1 |
| 30 | /* #define cpu_has_ejtag ? */ | 30 | /* #define cpu_has_ejtag ? */ |
| 31 | #ifdef CONFIG_CPU_HAS_LLSC | ||
| 32 | #define cpu_has_llsc 1 | 31 | #define cpu_has_llsc 1 |
| 33 | #else | ||
| 34 | #define cpu_has_llsc 0 | ||
| 35 | #endif | ||
| 36 | /* #define cpu_has_vtag_icache ? */ | 32 | /* #define cpu_has_vtag_icache ? */ |
| 37 | /* #define cpu_has_dc_aliases ? */ | 33 | /* #define cpu_has_dc_aliases ? */ |
| 38 | /* #define cpu_has_ic_fills_f_dc ? */ | 34 | /* #define cpu_has_ic_fills_f_dc ? */ |