diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-25 00:52:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-25 00:52:30 -0700 |
| commit | efdddf70cc1946feb4b00b1771cce3aef8efcc0e (patch) | |
| tree | ec80678dad8c5c215caf93fbdfc7c175972a9c7f /include/linux/sched.h | |
| parent | ecf2c2143f0865f447020144b2ee6e4181f65814 (diff) | |
| parent | 9d9682d81c14ef82d5fa566b2ebfa047c01c0fc1 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/lsm-2.5
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index b5e63d8ade25..6a7d0105a336 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -586,9 +586,9 @@ extern int request_irq(unsigned int, unsigned long, const char *, void *); extern void free_irq(unsigned int, void *); -/* capable prototype and code moved to security.[hc] */ -#include <linux/security.h> -#if 0 + +#ifndef CONFIG_SECURITY +/* capable prototype and code are in security.[hc] if CONFIG_SECURITY */ static inline int capable(int cap) { if (cap_raised(current->cap_effective, cap)) { @@ -597,7 +597,7 @@ static inline int capable(int cap) } return 0; } -#endif /* if 0 */ +#endif /* * Routines for handling mm_structs |