From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 22 Jan 2009 22:05:32 +0000 (+0000)
Subject: Patch actually applies now!
X-Git-Tag: reboot~24717
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e8fbf42dcfe01b3b3e7011707f3fc59bb0036df4;p=openwrt%2Fstaging%2Fjogo.git

Patch actually applies now!

SVN-Revision: 14150
---

diff --git a/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch b/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
index 77be55078b..3a04ef71a9 100644
--- a/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
+++ b/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
@@ -150079,37 +150079,6 @@ Index: linux-2.6.28/mm/Makefile
  obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o
  obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o
  obj-$(CONFIG_SLOB) += slob.o
-Index: linux-2.6.28/mm/shmem.c
-===================================================================
---- linux-2.6.28.orig/mm/shmem.c	2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/mm/shmem.c	2009-01-02 00:01:57.000000000 +0100
-@@ -2587,6 +2587,14 @@ put_memory:
- }
- EXPORT_SYMBOL_GPL(shmem_file_setup);
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+
- /**
-  * shmem_zero_setup - setup a shared anonymous mapping
-  * @vma: the vma to be mmapped is prepared by do_mmap_pgoff
-@@ -2600,9 +2608,7 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
-+
- 	return 0;
- }
 Index: linux-2.6.28/mm/tiny-shmem.c
 ===================================================================
 --- linux-2.6.28.orig/mm/tiny-shmem.c	2008-12-25 00:26:37.000000000 +0100