From 49bcb8c373c2390544e028ab9a9f54e9f2d4a525 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 11 Dec 2012 11:37:13 +1030
Subject: [PATCH] --- yaml --- r: 347104 b: refs/heads/master c:
 919aa45e43a84d40c27c83f6117cfa6542cee14e h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/kernel/Makefile              |  4 ++--
 trunk/kernel/modsign_certificate.S | 19 +++++++++++++++++++
 trunk/kernel/modsign_pubkey.c      |  6 ------
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 trunk/kernel/modsign_certificate.S

diff --git a/[refs] b/[refs]
index bd06a4f41cd5..c235238e206d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82fab442f5322b016f72891c0db2436c6a6c20b7
+refs/heads/master: 919aa45e43a84d40c27c83f6117cfa6542cee14e
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
index 86e3285ae7e5..0bd9d436341e 100644
--- a/trunk/kernel/Makefile
+++ b/trunk/kernel/Makefile
@@ -54,7 +54,7 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += module.o
-obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o
+obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o modsign_certificate.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KEXEC) += kexec.o
@@ -139,7 +139,7 @@ ifeq ($(CONFIG_MODULE_SIG),y)
 extra_certificates:
 	touch $@
 
-kernel/modsign_pubkey.o: signing_key.x509 extra_certificates
+kernel/modsign_certificate.o: signing_key.x509 extra_certificates
 
 ###############################################################################
 #
diff --git a/trunk/kernel/modsign_certificate.S b/trunk/kernel/modsign_certificate.S
new file mode 100644
index 000000000000..246b4c6e6135
--- /dev/null
+++ b/trunk/kernel/modsign_certificate.S
@@ -0,0 +1,19 @@
+/* SYMBOL_PREFIX defined on commandline from CONFIG_SYMBOL_PREFIX */
+#ifndef SYMBOL_PREFIX
+#define ASM_SYMBOL(sym) sym
+#else
+#define PASTE2(x,y) x##y
+#define PASTE(x,y) PASTE2(x,y)
+#define ASM_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym)
+#endif
+
+#define GLOBAL(name)	\
+	.globl ASM_SYMBOL(name);	\
+	ASM_SYMBOL(name):
+
+	.section ".init.data","aw"
+
+GLOBAL(modsign_certificate_list)
+	.incbin "signing_key.x509"
+	.incbin "extra_certificates"
+GLOBAL(modsign_certificate_list_end)
diff --git a/trunk/kernel/modsign_pubkey.c b/trunk/kernel/modsign_pubkey.c
index 767e559dfb10..045504fffbb2 100644
--- a/trunk/kernel/modsign_pubkey.c
+++ b/trunk/kernel/modsign_pubkey.c
@@ -20,12 +20,6 @@ struct key *modsign_keyring;
 
 extern __initdata const u8 modsign_certificate_list[];
 extern __initdata const u8 modsign_certificate_list_end[];
-asm(".section .init.data,\"aw\"\n"
-    SYMBOL_PREFIX "modsign_certificate_list:\n"
-    ".incbin \"signing_key.x509\"\n"
-    ".incbin \"extra_certificates\"\n"
-    SYMBOL_PREFIX "modsign_certificate_list_end:"
-    );
 
 /*
  * We need to make sure ccache doesn't cache the .o file as it doesn't notice