From: Kees Cook <keescook@chromium.org>
Date: Thu, 17 Mar 2016 11:45:33 +0000 (+0100)
Subject: s390: disable postinit-readonly for now
X-Git-Tag: v4.6-rc2~19^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df9ceff906abf5edc284c11ac899b3b3f32b4dd3;p=karo-tx-linux.git

s390: disable postinit-readonly for now

This is a temporary fix to let lkdtm run again on s390, though it'll
still fail the ro_after_init tests. Until rodata and ro_after_init
sections can be split on s390, disable special handling of ro_after_init.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
index 4d7ccac5fd1d..22da3b34c655 100644
--- a/arch/s390/include/asm/cache.h
+++ b/arch/s390/include/asm/cache.h
@@ -15,4 +15,7 @@
 
 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
 
+/* Read-only memory is marked before mark_rodata_ro() is called. */
+#define __ro_after_init __read_mostly
+
 #endif