]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jan 2020 02:55:17 +0000 (18:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jan 2020 02:55:17 +0000 (18:55 -0800)
Pull security subsystem update from James Morris:
 "Just one minor fix this time"

* 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: remove EARLY_LSM_COUNT which never used

security/security.c

index 2b5473d924160b76a73ef5dc4111caab58370b45..565bc9b6727629c7add1444e1ce496fff8cead80 100644 (file)
@@ -33,7 +33,6 @@
 
 /* How many LSMs were built into the kernel? */
 #define LSM_COUNT (__end_lsm_info - __start_lsm_info)
-#define EARLY_LSM_COUNT (__end_early_lsm_info - __start_early_lsm_info)
 
 /*
  * These are descriptions of the reasons that can be passed to the