オープンソース・ソフトウェアの開発とダウンロード

Subversion リポジトリの参照

Diff of /trunk/1.8.x/ccs-patch/security/ccsecurity/compat.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2944 by kumaneko, Mon Aug 24 05:00:52 2009 UTC revision 3502 by kumaneko, Mon Mar 8 08:44:55 2010 UTC
# Line 1  Line 1 
1  /*  /*
2   * security/ccsecurity/compat.h   * security/ccsecurity/compat.h
3   *   *
4   * Copyright (C) 2005-2009  NTT DATA CORPORATION   * Copyright (C) 2005-2010  NTT DATA CORPORATION
5   *   *
6   * Version: 1.7.0-pre   2009/08/24   * Version: 1.7.2-pre   2010/03/08
7   *   *
8   * This file is applicable to both 2.4.30 and 2.6.11 and later.   * This file is applicable to both 2.4.30 and 2.6.11 and later.
9   * See README.ccs for ChangeLog.   * See README.ccs for ChangeLog.
# Line 58  Line 58 
58  #define KERN_CONT ""  #define KERN_CONT ""
59  #endif  #endif
60    
 /* To support PID namespace. */  
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)  
 #define find_task_by_pid find_task_by_vpid  
 #endif  
   
61  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
62  #define mutex semaphore  #define mutex semaphore
63  #define mutex_init(mutex) init_MUTEX(mutex)  #define mutex_init(mutex) init_MUTEX(mutex)
# Line 172  static inline void list_del_rcu(struct l Line 167  static inline void list_del_rcu(struct l
167    
168  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
169  #define s_fs_info u.generic_sbp  #define s_fs_info u.generic_sbp
 #else  
 #include <linux/audit.h>  
 #ifdef AUDIT_APPARMOR_AUDIT  
 /* AppArmor patch adds "struct vfsmount" to VFS helper functions. */  
 #define HAVE_VFSMOUNT_IN_VFS_HELPER  
 #endif  
 #endif  
   
 #if defined(RHEL_MAJOR) && RHEL_MAJOR == 5  
 #define HAVE_NO_I_BLKSIZE_IN_INODE  
 #elif defined(AX_MAJOR) && AX_MAJOR == 3  
 #define HAVE_NO_I_BLKSIZE_IN_INODE  
170  #endif  #endif
171    
172  #ifndef list_for_each_entry_safe  #ifndef list_for_each_entry_safe
# Line 219  static inline struct socket *SOCKET_I(st Line 202  static inline struct socket *SOCKET_I(st
202  #endif /* __LITTLE_ENDIAN */  #endif /* __LITTLE_ENDIAN */
203  #endif  #endif
204    
 #ifndef _LINUX_SRCU_H  
   
 struct srcu_struct {  
         int counter_idx;  
         int counter[2];  
 };  
   
 static inline int init_srcu_struct(struct srcu_struct *sp)  
 {  
         return 0;  
 }  
   
 int srcu_read_lock(struct srcu_struct *sp);  
 void srcu_read_unlock(struct srcu_struct *sp, const int idx);  
 void synchronize_srcu(struct srcu_struct *sp);  
   
 #endif  
   
205  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
206    #ifndef _STRUCT_PATH_DEFINED
207  struct path {  struct path {
208          struct vfsmount *mnt;          struct vfsmount *mnt;
209          struct dentry *dentry;          struct dentry *dentry;
210  };  };
211    #endif
212  #endif  #endif
213    
214  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)

Legend:
Removed from v.2944  
changed lines
  Added in v.3502

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26