diff options
Diffstat (limited to 'arch/sh/mm/cache-debugfs.c')
-rw-r--r-- | arch/sh/mm/cache-debugfs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c index 5ba067b26591..690ed010d002 100644 --- a/arch/sh/mm/cache-debugfs.c +++ b/arch/sh/mm/cache-debugfs.c | |||
@@ -22,8 +22,7 @@ enum cache_type { | |||
22 | CACHE_TYPE_UNIFIED, | 22 | CACHE_TYPE_UNIFIED, |
23 | }; | 23 | }; |
24 | 24 | ||
25 | static int __uses_jump_to_uncached cache_seq_show(struct seq_file *file, | 25 | static int cache_seq_show(struct seq_file *file, void *iter) |
26 | void *iter) | ||
27 | { | 26 | { |
28 | unsigned int cache_type = (unsigned int)file->private; | 27 | unsigned int cache_type = (unsigned int)file->private; |
29 | struct cache_info *cache; | 28 | struct cache_info *cache; |
@@ -37,7 +36,7 @@ static int __uses_jump_to_uncached cache_seq_show(struct seq_file *file, | |||
37 | */ | 36 | */ |
38 | jump_to_uncached(); | 37 | jump_to_uncached(); |
39 | 38 | ||
40 | ccr = ctrl_inl(CCR); | 39 | ccr = __raw_readl(CCR); |
41 | if ((ccr & CCR_CACHE_ENABLE) == 0) { | 40 | if ((ccr & CCR_CACHE_ENABLE) == 0) { |
42 | back_to_cached(); | 41 | back_to_cached(); |
43 | 42 | ||
@@ -90,7 +89,7 @@ static int __uses_jump_to_uncached cache_seq_show(struct seq_file *file, | |||
90 | for (addr = addrstart, line = 0; | 89 | for (addr = addrstart, line = 0; |
91 | addr < addrstart + waysize; | 90 | addr < addrstart + waysize; |
92 | addr += cache->linesz, line++) { | 91 | addr += cache->linesz, line++) { |
93 | unsigned long data = ctrl_inl(addr); | 92 | unsigned long data = __raw_readl(addr); |
94 | 93 | ||
95 | /* Check the V bit, ignore invalid cachelines */ | 94 | /* Check the V bit, ignore invalid cachelines */ |
96 | if ((data & 1) == 0) | 95 | if ((data & 1) == 0) |