aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2009-02-10 23:01:19 -0500
committerJames Morris <jmorris@namei.org>2009-02-11 15:27:15 +1100
commited850a52af971528b048812c4215cef298af0d3b (patch)
treee78fdb9e91e61dd297df2b126527340b483ae2a2
parentcb5629b10d64a8006622ce3a52bc887d91057d69 (diff)
integrity: shmem zero fix
Based on comments from Mike Frysinger and Randy Dunlap: (http://lkml.org/lkml/2009/2/9/262) - moved ima.h include before CONFIG_SHMEM test to fix compiler error on Blackfin: mm/shmem.c: In function 'shmem_zero_setup': mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check' - added 'struct linux_binprm' in ima.h to fix compiler warning on Blackfin: In file included from mm/shmem.c:32: include/linux/ima.h:25: warning: 'struct linux_binprm' declared inside parameter list include/linux/ima.h:25: warning: its scope is only this definition or declaration, which is probably not what you want - moved fs.h include within _LINUX_IMA_H definition Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/ima.h5
-rw-r--r--mm/shmem.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 6db30a328d9..0e2aa45cb0c 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -7,11 +7,12 @@
* the Free Software Foundation, version 2 of the License.
*/
-#include <linux/fs.h>
-
#ifndef _LINUX_IMA_H
#define _LINUX_IMA_H
+#include <linux/fs.h>
+struct linux_binprm;
+
#ifdef CONFIG_IMA
extern int ima_bprm_check(struct linux_binprm *bprm);
extern int ima_inode_alloc(struct inode *inode);
diff --git a/mm/shmem.c b/mm/shmem.c
index 75199888a6b..8135fac294e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -28,6 +28,7 @@
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/swap.h>
+#include <linux/ima.h>
static struct vfsmount *shm_mnt;
@@ -59,7 +60,6 @@ static struct vfsmount *shm_mnt;
#include <linux/highmem.h>
#include <linux/seq_file.h>
#include <linux/magic.h>
-#include <linux/ima.h>
#include <asm/uaccess.h>
#include <asm/div64.h>