aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-07 10:14:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-07 10:14:47 -0800
commit17ce1b201d8309ca9e23c063660a789fe3798704 (patch)
tree8c390e999a6694388c2eb78dd57fb8e7a0579ff0
parentMerge tag 'hwmon-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff)
parentopenrisc: Define __ro_after_init to avoid crash (diff)
downloadlinux-dev-17ce1b201d8309ca9e23c063660a789fe3798704.tar.xz
linux-dev-17ce1b201d8309ca9e23c063660a789fe3798704.zip
Merge tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull openrisc fix from Guenter Roeck: "Fix openrisc crash caused by ro_init changes" * tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: openrisc: Define __ro_after_init to avoid crash
-rw-r--r--arch/openrisc/include/asm/cache.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
index 4ce7a01a252d..5f55da9cbfd5 100644
--- a/arch/openrisc/include/asm/cache.h
+++ b/arch/openrisc/include/asm/cache.h
@@ -23,6 +23,8 @@
* they shouldn't be hard-coded!
*/
+#define __ro_after_init __read_mostly
+
#define L1_CACHE_BYTES 16
#define L1_CACHE_SHIFT 4