diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-08 17:48:16 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-08 17:48:15 -0800 |
| commit | 1a80cbf258771344fbde2339d2c164a1a547f317 (patch) | |
| tree | 2d9b883aded95efdd6ece83d4b365c94a217f830 /include/linux | |
| parent | 7b50cd15868fbe1e44d69181a7c3cb78c2ed97cc (diff) | |
| parent | a1cd6239e49dc1a6a3d34ad555745da103a79350 (diff) | |
Merge "ice: fix issue with losing ICE key configuration during reset"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pfk.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/pfk.h b/include/linux/pfk.h index 2fc64442b8ee..82ee74199752 100644 --- a/include/linux/pfk.h +++ b/include/linux/pfk.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -24,6 +24,7 @@ int pfk_load_key_start(const struct bio *bio, int pfk_load_key_end(const struct bio *bio, bool *is_pfe); int pfk_remove_key(const unsigned char *key, size_t key_size); bool pfk_allow_merge_bio(const struct bio *bio1, const struct bio *bio2); +void pfk_clear_on_reset(void); #else static inline int pfk_load_key_start(const struct bio *bio, @@ -48,6 +49,9 @@ static inline bool pfk_allow_merge_bio(const struct bio *bio1, return true; } +static inline void pfk_clear_on_reset(void) +{} + #endif /* CONFIG_PFK */ #endif /* PFK_H */ |