summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-14 14:07:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-14 14:07:13 -0800
commitd4b9532367c77a35849d6cce491a3ca474c519cf (patch)
treef28d93cdd9c62a4368e71647ae1d0578432b9312
parentac38126b2b9533b9e660d25308091bf4bb395726 (diff)
parente123386bc31bbf467dc558f2f919de0b8b4ba58c (diff)
downloadlinux-d4b9532367c77a35849d6cce491a3ca474c519cf.tar.bz2
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile bugfix from Chris Metcalf: "This just fixes an incompatibility with tile __ro_after_init" * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: handle __ro_after_init like parisc does
-rw-r--r--arch/tile/include/asm/cache.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
index 6160761d5f61..4810e48dbbbf 100644
--- a/arch/tile/include/asm/cache.h
+++ b/arch/tile/include/asm/cache.h
@@ -61,4 +61,7 @@
*/
#define __write_once __read_mostly
+/* __ro_after_init is the generic name for the tile arch __write_once. */
+#define __ro_after_init __read_mostly
+
#endif /* _ASM_TILE_CACHE_H */