summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-02-28 20:50:57 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-02-28 20:50:57 +0000
commit554266a19e43960977bb85b440c15fdebee76241 (patch)
tree846eb9f7899e25cb2c80dea88ef8d872a2d81bc8 /target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
parenta1bd9bdd429c9139a9e4bfd76adb2e491391dc7e (diff)
[kernel] misc 2.6.33 compilation and config symbols fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19920 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch12
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
index 6eee31d2d..39b22150b 100644
--- a/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
@@ -1,6 +1,14 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2620,6 +2620,16 @@ int shmem_lock(struct file *file, int lo
+@@ -29,6 +29,7 @@
+ #include <linux/mm.h>
+ #include <linux/module.h>
+ #include <linux/swap.h>
++#include <linux/ima.h>
+
+ static struct vfsmount *shm_mnt;
+
+@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
/* common code */
@@ -17,7 +25,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2697,9 +2707,6 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);