summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2013-09-11 21:23:19 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 22:58:21 (GMT)
commit54a33b1b1470ada14fa2998e8b48ad4a0ef6a916 (patch)
tree10769fd2734cac612a9311a231591f097f6baefc
parent3ddc5b46a8e90f3c9251338b60191d0a804b0d92 (diff)
downloadlinux-54a33b1b1470ada14fa2998e8b48ad4a0ef6a916.tar.xz
kernel/modsign_pubkey.c: fix init const for module signing code
const has to use __initconst, not __initdata Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: David Howells <dhowells@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/modsign_pubkey.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/modsign_pubkey.c b/kernel/modsign_pubkey.c
index 2b6e699..7cbd450 100644
--- a/kernel/modsign_pubkey.c
+++ b/kernel/modsign_pubkey.c
@@ -18,14 +18,14 @@
struct key *modsign_keyring;
-extern __initdata const u8 modsign_certificate_list[];
-extern __initdata const u8 modsign_certificate_list_end[];
+extern __initconst const u8 modsign_certificate_list[];
+extern __initconst const u8 modsign_certificate_list_end[];
/*
* We need to make sure ccache doesn't cache the .o file as it doesn't notice
* if modsign.pub changes.
*/
-static __initdata const char annoy_ccache[] = __TIME__ "foo";
+static __initconst const char annoy_ccache[] = __TIME__ "foo";
/*
* Load the compiled-in keys