diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-23 03:07:52 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 03:07:52 +0200 |
| commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
| tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /security/keys/encrypted-keys/encrypted.h | |
| parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into... (diff) | |
| parent | KEYS: Merge the type-specific data with the payload data (diff) | |
| download | linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.xz linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.zip | |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.h')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/encrypted-keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h index 8136a2d44c63..47802c0de735 100644 --- a/security/keys/encrypted-keys/encrypted.h +++ b/security/keys/encrypted-keys/encrypted.h @@ -5,10 +5,10 @@ #if defined(CONFIG_TRUSTED_KEYS) || \ (defined(CONFIG_TRUSTED_KEYS_MODULE) && defined(CONFIG_ENCRYPTED_KEYS_MODULE)) extern struct key *request_trusted_key(const char *trusted_desc, - u8 **master_key, size_t *master_keylen); + const u8 **master_key, size_t *master_keylen); #else static inline struct key *request_trusted_key(const char *trusted_desc, - u8 **master_key, + const u8 **master_key, size_t *master_keylen) { return ERR_PTR(-EOPNOTSUPP); |