diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 20:07:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 20:07:38 -0500 |
| commit | 1811534a80697b34add31cff53a321cfc291ddfe (patch) | |
| tree | ed4978f2fcf8565baf61afbe4b3d10187cf577a8 /include | |
| parent | b62c855938be50c13f3f2aa81fafe4a9ca2b6650 (diff) | |
| parent | e6a1bb725eab1348d4a985b7faeff8186210d7b4 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix build.
[MIPS] Fix use of smp_processor_id() in preemptible code.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/cpu-features.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h index f6bd308f047f..5ea701fc3425 100644 --- a/include/asm-mips/cpu-features.h +++ b/include/asm-mips/cpu-features.h | |||
| @@ -207,13 +207,13 @@ | |||
| 207 | #endif | 207 | #endif |
| 208 | 208 | ||
| 209 | #ifndef cpu_dcache_line_size | 209 | #ifndef cpu_dcache_line_size |
| 210 | #define cpu_dcache_line_size() current_cpu_data.dcache.linesz | 210 | #define cpu_dcache_line_size() cpu_data[0].dcache.linesz |
| 211 | #endif | 211 | #endif |
| 212 | #ifndef cpu_icache_line_size | 212 | #ifndef cpu_icache_line_size |
| 213 | #define cpu_icache_line_size() current_cpu_data.icache.linesz | 213 | #define cpu_icache_line_size() cpu_data[0].icache.linesz |
| 214 | #endif | 214 | #endif |
| 215 | #ifndef cpu_scache_line_size | 215 | #ifndef cpu_scache_line_size |
| 216 | #define cpu_scache_line_size() current_cpu_data.scache.linesz | 216 | #define cpu_scache_line_size() cpu_data[0].scache.linesz |
| 217 | #endif | 217 | #endif |
| 218 | 218 | ||
| 219 | #endif /* __ASM_CPU_FEATURES_H */ | 219 | #endif /* __ASM_CPU_FEATURES_H */ |