Merge tag 'safesetid-5.14' of git://github.com/micah-morton/linux

Pull SafeSetID update from Micah Morton:
 "One very minor code cleanup change that marks a variable as
  __initdata"

* tag 'safesetid-5.14' of git://github.com/micah-morton/linux:
  LSM: SafeSetID: Mark safesetid_initialized as __initdata
This commit is contained in:
Linus Torvalds
2021-06-30 15:30:47 -07:00
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@
#include "lsm.h" #include "lsm.h"
/* Flag indicating whether initialization completed */ /* Flag indicating whether initialization completed */
int safesetid_initialized; int safesetid_initialized __initdata;
struct setid_ruleset __rcu *safesetid_setuid_rules; struct setid_ruleset __rcu *safesetid_setuid_rules;
struct setid_ruleset __rcu *safesetid_setgid_rules; struct setid_ruleset __rcu *safesetid_setgid_rules;

View File

@ -19,7 +19,7 @@
#include <linux/hashtable.h> #include <linux/hashtable.h>
/* Flag indicating whether initialization completed */ /* Flag indicating whether initialization completed */
extern int safesetid_initialized; extern int safesetid_initialized __initdata;
enum sid_policy_type { enum sid_policy_type {
SIDPOL_DEFAULT, /* source ID is unaffected by policy */ SIDPOL_DEFAULT, /* source ID is unaffected by policy */