diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 17:07:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 17:07:38 -0800 |
| commit | 1811534a80697b34add31cff53a321cfc291ddfe (patch) | |
| tree | ed4978f2fcf8565baf61afbe4b3d10187cf577a8 /include | |
| parent | b62c855938be50c13f3f2aa81fafe4a9ca2b6650 (diff) | |
| parent | e6a1bb725eab1348d4a985b7faeff8186210d7b4 (diff) | |
| download | linux-1811534a80697b34add31cff53a321cfc291ddfe.tar.gz linux-1811534a80697b34add31cff53a321cfc291ddfe.tar.bz2 linux-1811534a80697b34add31cff53a321cfc291ddfe.zip | |
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 @@ #endif #ifndef cpu_dcache_line_size -#define cpu_dcache_line_size() current_cpu_data.dcache.linesz +#define cpu_dcache_line_size() cpu_data[0].dcache.linesz #endif #ifndef cpu_icache_line_size -#define cpu_icache_line_size() current_cpu_data.icache.linesz +#define cpu_icache_line_size() cpu_data[0].icache.linesz #endif #ifndef cpu_scache_line_size -#define cpu_scache_line_size() current_cpu_data.scache.linesz +#define cpu_scache_line_size() cpu_data[0].scache.linesz #endif #endif /* __ASM_CPU_FEATURES_H */ |