diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 00:41:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 00:41:27 +0200 |
| commit | 429f731dea577bdd43693940cdca524135287e6a (patch) | |
| tree | 932337b7d23dd736612c6b6e6601c50bc24cfc5f /security | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Deprecate the asm/semaphore.h files in feature-removal-schedule. (diff) | |
| download | linux-429f731dea577bdd43693940cdca524135287e6a.tar.xz linux-429f731dea577bdd43693940cdca524135287e6a.zip | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Deprecate the asm/semaphore.h files in feature-removal-schedule.
Convert asm/semaphore.h users to linux/semaphore.h
security: Remove unnecessary inclusions of asm/semaphore.h
lib: Remove unnecessary inclusions of asm/semaphore.h
kernel: Remove unnecessary inclusions of asm/semaphore.h
include: Remove unnecessary inclusions of asm/semaphore.h
fs: Remove unnecessary inclusions of asm/semaphore.h
drivers: Remove unnecessary inclusions of asm/semaphore.h
net: Remove unnecessary inclusions of asm/semaphore.h
arch: Remove unnecessary inclusions of asm/semaphore.h
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/selinuxfs.c | 1 | ||||
| -rw-r--r-- | security/selinux/ss/conditional.c | 1 | ||||
| -rw-r--r-- | security/selinux/xfrm.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 26fabad09769..7b681692be47 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -28,7 +28,6 @@ #include <linux/percpu.h> #include <linux/audit.h> #include <asm/uaccess.h> -#include <asm/semaphore.h> /* selinuxfs pseudo filesystem for exporting the security policy API. Based on the proc code and the fs/nfsd/nfsctl.c code. */ diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index a996cf1d378a..da0566c4f329 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -11,7 +11,6 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/spinlock.h> -#include <asm/semaphore.h> #include <linux/slab.h> #include "security.h" diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 874d17c83c61..3b8b994faad4 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c @@ -45,7 +45,6 @@ #include <net/xfrm.h> #include <net/checksum.h> #include <net/udp.h> -#include <asm/semaphore.h> #include <asm/atomic.h> #include "avc.h" |