diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /include/linux | |
| parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
| parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ima.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h index 99dc6d5cf7e5..975837e7d6c0 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h | |||
| @@ -17,7 +17,7 @@ struct linux_binprm; | |||
| 17 | extern int ima_bprm_check(struct linux_binprm *bprm); | 17 | extern int ima_bprm_check(struct linux_binprm *bprm); |
| 18 | extern int ima_inode_alloc(struct inode *inode); | 18 | extern int ima_inode_alloc(struct inode *inode); |
| 19 | extern void ima_inode_free(struct inode *inode); | 19 | extern void ima_inode_free(struct inode *inode); |
| 20 | extern int ima_path_check(struct path *path, int mask); | 20 | extern int ima_file_check(struct file *file, int mask); |
| 21 | extern void ima_file_free(struct file *file); | 21 | extern void ima_file_free(struct file *file); |
| 22 | extern int ima_file_mmap(struct file *file, unsigned long prot); | 22 | extern int ima_file_mmap(struct file *file, unsigned long prot); |
| 23 | extern void ima_counts_get(struct file *file); | 23 | extern void ima_counts_get(struct file *file); |
| @@ -38,7 +38,7 @@ static inline void ima_inode_free(struct inode *inode) | |||
| 38 | return; | 38 | return; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | static inline int ima_path_check(struct path *path, int mask) | 41 | static inline int ima_file_check(struct file *file, int mask) |
| 42 | { | 42 | { |
| 43 | return 0; | 43 | return 0; |
| 44 | } | 44 | } |