projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mmc-v3.17-1' of git://git.linaro.org/people/ulf.hansson/mmc
[cascardo/linux.git]
/
kernel
/
system_keyring.c
diff --git
a/kernel/system_keyring.c
b/kernel/system_keyring.c
index
52ebc70
..
875f64e
100644
(file)
--- a/
kernel/system_keyring.c
+++ b/
kernel/system_keyring.c
@@
-89,6
+89,7
@@
static __init int load_system_certificate_list(void)
pr_err("Problem loading in-kernel X.509 certificate (%ld)\n",
PTR_ERR(key));
} else {
+ set_bit(KEY_FLAG_BUILTIN, &key_ref_to_ptr(key)->flags);
pr_notice("Loaded X.509 cert '%s'\n",
key_ref_to_ptr(key)->description);
key_ref_put(key);