2013-04-21 03:43:05

by Andi Kleen

Subject: [PATCH] initconst fixes for module signing

From: Andi Kleen <[email protected]>

Signed-off-by: Andi Kleen <[email protected]>

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

2013-04-22 09:25:14

by Rusty Russell

Subject: Re: [PATCH] initconst fixes for module signing

Andi Kleen <[email protected]> writes:
> From: Andi Kleen <[email protected]>
>
> Signed-off-by: Andi Kleen <[email protected]>

Thanks, applied.

Cheers,
Rusty.

> 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