diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h | |
| parent | 78c210efdefe07131f91ed512a3308b15bb14e2f (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8' into HEAD
Diffstat (limited to 'arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h')
| -rw-r--r-- | arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h index ce5b6e270e3f..9947e57c91de 100644 --- a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #define cpu_has_cache_cdex_p 0 | 29 | #define cpu_has_cache_cdex_p 0 |
| 30 | #define cpu_has_cache_cdex_s 0 | 30 | #define cpu_has_cache_cdex_s 0 |
| 31 | #define cpu_has_counter 1 | 31 | #define cpu_has_counter 1 |
| 32 | #define cpu_has_dc_aliases 1 | 32 | #define cpu_has_dc_aliases (PAGE_SIZE < 0x4000) |
| 33 | #define cpu_has_divec 0 | 33 | #define cpu_has_divec 0 |
| 34 | #define cpu_has_dsp 0 | 34 | #define cpu_has_dsp 0 |
| 35 | #define cpu_has_ejtag 0 | 35 | #define cpu_has_ejtag 0 |
| @@ -54,6 +54,5 @@ | |||
| 54 | #define cpu_has_vce 0 | 54 | #define cpu_has_vce 0 |
| 55 | #define cpu_has_vtag_icache 0 | 55 | #define cpu_has_vtag_icache 0 |
| 56 | #define cpu_has_watch 1 | 56 | #define cpu_has_watch 1 |
| 57 | #define cpu_icache_snoops_remote_store 1 | ||
| 58 | 57 | ||
| 59 | #endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */ | 58 | #endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */ |