Re: ima changes to shmem breaks !CONFIG_SHMEM

[James Morris]

On Mon, 9 Feb 2009, Mike Frysinger wrote:

> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
> for Blackfin systems:
>   CC      mm/shmem.o
> mm/shmem.c: In function 'shmem_zero_setup':
> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
> make[1]: *** [mm/shmem.o] Error 1
> 
> that's because the ima.h include was added behind the CONFIG_SHMEM
> markings rather than everywhere, just like the function is used.

Does this seem like the correct fix?

--- 

diff --git a/mm/shmem.c b/mm/shmem.c
index 7519988..8135fac 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>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/