diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /include/linux/security.h | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 31c8851ec5d0..f0e9adb22ac2 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -102,9 +102,7 @@ extern unsigned long mmap_min_addr; | |||
| 102 | #define LSM_SETID_FS 8 | 102 | #define LSM_SETID_FS 8 |
| 103 | 103 | ||
| 104 | /* forward declares to avoid warnings */ | 104 | /* forward declares to avoid warnings */ |
| 105 | struct nfsctl_arg; | ||
| 106 | struct sched_param; | 105 | struct sched_param; |
| 107 | struct swap_info_struct; | ||
| 108 | struct request_sock; | 106 | struct request_sock; |
| 109 | 107 | ||
| 110 | /* bprm_apply_creds unsafe reasons */ | 108 | /* bprm_apply_creds unsafe reasons */ |