diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-02-28 20:50:57 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-02-28 20:50:57 +0000 |
| commit | 9fc22cd0328f840ea4e8e85cc5b86aa3eb8c0423 (patch) | |
| tree | e51bc93fdabc62d5fbe8de25d8df73399cf2cf5b /target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch | |
| parent | 984ac762e463a84395d1d7903234207c6bd984dd (diff) | |
| download | upstream-9fc22cd0328f840ea4e8e85cc5b86aa3eb8c0423.tar.gz upstream-9fc22cd0328f840ea4e8e85cc5b86aa3eb8c0423.tar.bz2 upstream-9fc22cd0328f840ea4e8e85cc5b86aa3eb8c0423.zip | |
misc 2.6.33 compilation and config symbols fixes
SVN-Revision: 19920
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.patch | 12 |
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 6eee31d2df..39b22150b9 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); |