diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh2/probe.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh2/probe.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c index ba527d9b5024..108e81b682ed 100644 --- a/arch/sh/kernel/cpu/sh2/probe.c +++ b/arch/sh/kernel/cpu/sh2/probe.c | |||
@@ -18,27 +18,27 @@ | |||
18 | int __init detect_cpu_and_cache_system(void) | 18 | int __init detect_cpu_and_cache_system(void) |
19 | { | 19 | { |
20 | #if defined(CONFIG_CPU_SUBTYPE_SH7604) | 20 | #if defined(CONFIG_CPU_SUBTYPE_SH7604) |
21 | cpu_data->type = CPU_SH7604; | 21 | current_cpu_data.type = CPU_SH7604; |
22 | cpu_data->dcache.ways = 4; | 22 | current_cpu_data.dcache.ways = 4; |
23 | cpu_data->dcache.way_incr = (1<<10); | 23 | current_cpu_data.dcache.way_incr = (1<<10); |
24 | cpu_data->dcache.sets = 64; | 24 | current_cpu_data.dcache.sets = 64; |
25 | cpu_data->dcache.entry_shift = 4; | 25 | current_cpu_data.dcache.entry_shift = 4; |
26 | cpu_data->dcache.linesz = L1_CACHE_BYTES; | 26 | current_cpu_data.dcache.linesz = L1_CACHE_BYTES; |
27 | cpu_data->dcache.flags = 0; | 27 | current_cpu_data.dcache.flags = 0; |
28 | #elif defined(CONFIG_CPU_SUBTYPE_SH7619) | 28 | #elif defined(CONFIG_CPU_SUBTYPE_SH7619) |
29 | cpu_data->type = CPU_SH7619; | 29 | current_cpu_data.type = CPU_SH7619; |
30 | cpu_data->dcache.ways = 4; | 30 | current_cpu_data.dcache.ways = 4; |
31 | cpu_data->dcache.way_incr = (1<<12); | 31 | current_cpu_data.dcache.way_incr = (1<<12); |
32 | cpu_data->dcache.sets = 256; | 32 | current_cpu_data.dcache.sets = 256; |
33 | cpu_data->dcache.entry_shift = 4; | 33 | current_cpu_data.dcache.entry_shift = 4; |
34 | cpu_data->dcache.linesz = L1_CACHE_BYTES; | 34 | current_cpu_data.dcache.linesz = L1_CACHE_BYTES; |
35 | cpu_data->dcache.flags = 0; | 35 | current_cpu_data.dcache.flags = 0; |
36 | #endif | 36 | #endif |
37 | /* | 37 | /* |
38 | * SH-2 doesn't have separate caches | 38 | * SH-2 doesn't have separate caches |
39 | */ | 39 | */ |
40 | cpu_data->dcache.flags |= SH_CACHE_COMBINED; | 40 | current_cpu_data.dcache.flags |= SH_CACHE_COMBINED; |
41 | cpu_data->icache = cpu_data->dcache; | 41 | current_cpu_data.icache = current_cpu_data.dcache; |
42 | 42 | ||
43 | return 0; | 43 | return 0; |
44 | } | 44 | } |