diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-10 17:23:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-10 17:23:53 -0700 |
| commit | f914ffa602580ebf06640bf6a4ac37feaf94b7b8 (patch) | |
| tree | c3522334f01a60366c8c3f53dd490b97e489955d | |
| parent | 55ef5c3defc6b3725ccb647c33e730e2efc42e7b (diff) | |
| parent | 670225d6206af9d9af1c46b7903f48511afe3153 (diff) | |
Merge "security: pfe: Remove __exit annotation to fix section mismatch"
| -rw-r--r-- | security/pfe/pfk_ecryptfs.c | 2 | ||||
| -rw-r--r-- | security/pfe/pfk_ecryptfs.h | 4 | ||||
| -rw-r--r-- | security/pfe/pfk_ext4.c | 4 | ||||
| -rw-r--r-- | security/pfe/pfk_ext4.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/security/pfe/pfk_ecryptfs.c b/security/pfe/pfk_ecryptfs.c index f98d85ab4841..f55ee83c30ed 100644 --- a/security/pfe/pfk_ecryptfs.c +++ b/security/pfe/pfk_ecryptfs.c @@ -112,7 +112,7 @@ static int __init pfk_ecryptfs_lsm_init(void) /* * pfk_ecryptfs_deinit() - Deinit function, should be invoked by upper PFK layer */ -void __exit pfk_ecryptfs_deinit(void) +void pfk_ecryptfs_deinit(void) { pfk_ecryptfs_ready = false; ecryptfs_unregister_from_events(g_events_handle); diff --git a/security/pfe/pfk_ecryptfs.h b/security/pfe/pfk_ecryptfs.h index 1d9942c4c09b..bd3a8f2800b8 100644 --- a/security/pfe/pfk_ecryptfs.h +++ b/security/pfe/pfk_ecryptfs.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 @@ -34,6 +34,6 @@ bool pfk_ecryptfs_allow_merge_bio(const struct bio *bio1, int __init pfk_ecryptfs_init(void); -void __exit pfk_ecryptfs_deinit(void); +void pfk_ecryptfs_deinit(void); #endif /* _PFK_ECRYPTFS_H_ */ diff --git a/security/pfe/pfk_ext4.c b/security/pfe/pfk_ext4.c index 07e2c7ab829c..b9df18f9fb01 100644 --- a/security/pfe/pfk_ext4.c +++ b/security/pfe/pfk_ext4.c @@ -1,5 +1,5 @@ /* - * 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 @@ -44,7 +44,7 @@ static bool pfk_ext4_ready; /* * pfk_ext4_deinit() - Deinit function, should be invoked by upper PFK layer */ -void __exit pfk_ext4_deinit(void) +void pfk_ext4_deinit(void) { pfk_ext4_ready = false; } diff --git a/security/pfe/pfk_ext4.h b/security/pfe/pfk_ext4.h index 6b367b428e50..1f336325f1db 100644 --- a/security/pfe/pfk_ext4.h +++ b/security/pfe/pfk_ext4.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 @@ -32,6 +32,6 @@ bool pfk_ext4_allow_merge_bio(const struct bio *bio1, int __init pfk_ext4_init(void); -void __exit pfk_ext4_deinit(void); +void pfk_ext4_deinit(void); #endif /* _PFK_EXT4_H_ */ |