Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 670225d6 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

security: pfe: Remove __exit annotation to fix section mismatch 



pfk_ext4_deinit() is called from init code and we throw away
__exit marked code when modules are built-in. Remove the __exit
markings here so that we can always call this function even from
__init code. Similarly for pfk_ecryptfs_deinit().

Change-Id: I80a3304d84cdf18772879efe6c4a955d873b89c4
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 4c332132

security/pfe/pfk_ecryptfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

security/pfe/pfk_ecryptfs.h

+2 −2
Original line number Diff line number Diff line 
/* 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_ */

security/pfe/pfk_ext4.c

+2 −2
Original line number Diff line number Diff line 
/*

 * 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;

}

security/pfe/pfk_ext4.h

+2 −2
Original line number Diff line number Diff line 
/* 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_ */