panic: change nmi_panic from macro to function

[sfrench/cifs-2.6.git] / kernel / module_signing.c

diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index 6528a79d998d08120e9e80524164e5c759d911f3..64b9dead4a0763f2ad9e853a6221b31a0fa6f938 100644 (file)
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -11,10 +11,17 @@
 
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <keys/system_keyring.h>
 #include <crypto/public_key.h>
 #include "module-internal.h"
 
+enum pkey_id_type {
+       PKEY_ID_PGP,            /* OpenPGP generated key ID */
+       PKEY_ID_X509,           /* X.509 arbitrary subjectKeyIdentifier */
+       PKEY_ID_PKCS7,          /* Signature in PKCS#7 message */
+};
+
 /*
  * Module signature information block.
  *