diff options
| author | Geert Uytterhoeven | 2014-03-04 00:38:33 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-04 16:55:49 +0100 |
| commit | a5f6ea29f9a918403629f8369ae55fac6b09cb53 (patch) | |
| tree | a3a9cbaa19345e20aa79d66f975aa681db9d201d /arch/sh/mm/cache-sh2.c | |
| parent | ocfs2: fix quota file corruption (diff) | |
| download | kernel-qcow2-linux-a5f6ea29f9a918403629f8369ae55fac6b09cb53.tar.gz kernel-qcow2-linux-a5f6ea29f9a918403629f8369ae55fac6b09cb53.tar.xz kernel-qcow2-linux-a5f6ea29f9a918403629f8369ae55fac6b09cb53.zip | |
sh: prefix sh-specific "CCR" and "CCR2" by "SH_"
Commit bcf24e1daa94 ("mmc: omap_hsmmc: use the generic config for
omap2plus devices"), enabled the build for other platforms for compile
testing.
sh-allmodconfig now fails with:
include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant
make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1
This happens because SuperH #defines "CCR", which is one of the enum
values in include/linux/omap-dma.h. There's a similar issue with "CCR2"
on sh2a.
As "CCR" and "CCR2" are too generic names for global #defines, prefix
them with "SH_" to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sh/mm/cache-sh2.c')
| -rw-r--r-- | arch/sh/mm/cache-sh2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/cache-sh2.c b/arch/sh/mm/cache-sh2.c index defcf719f2e8..a74259f2f981 100644 --- a/arch/sh/mm/cache-sh2.c +++ b/arch/sh/mm/cache-sh2.c @@ -63,9 +63,9 @@ static void sh2__flush_invalidate_region(void *start, int size) local_irq_save(flags); jump_to_uncached(); - ccr = __raw_readl(CCR); + ccr = __raw_readl(SH_CCR); ccr |= CCR_CACHE_INVALIDATE; - __raw_writel(ccr, CCR); + __raw_writel(ccr, SH_CCR); back_to_cached(); local_irq_restore(flags); |