Changeset 14150


Ignore:
Timestamp:
2009-01-22T23:05:32+01:00 (8 years ago)
Author:
lars
Message:

Patch actually applies now!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch

    r13833 r14150  
    150080150080 obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o 
    150081150081 obj-$(CONFIG_SLOB) += slob.o 
    150082 Index: linux-2.6.28/mm/shmem.c 
    150083 =================================================================== 
    150084 --- linux-2.6.28.orig/mm/shmem.c        2008-12-25 00:26:37.000000000 +0100 
    150085 +++ linux-2.6.28/mm/shmem.c     2009-01-02 00:01:57.000000000 +0100 
    150086 @@ -2587,6 +2587,14 @@ put_memory: 
    150087  } 
    150088  EXPORT_SYMBOL_GPL(shmem_file_setup); 
    150089   
    150090 +void shmem_set_file(struct vm_area_struct *vma, struct file *file) 
    150091 +{ 
    150092 +       if (vma->vm_file) 
    150093 +               fput(vma->vm_file); 
    150094 +       vma->vm_file = file; 
    150095 +       vma->vm_ops = &shmem_vm_ops; 
    150096 +} 
    150097 + 
    150098  /** 
    150099   * shmem_zero_setup - setup a shared anonymous mapping 
    150100   * @vma: the vma to be mmapped is prepared by do_mmap_pgoff 
    150101 @@ -2600,9 +2608,7 @@ int shmem_zero_setup(struct vm_area_stru 
    150102         if (IS_ERR(file)) 
    150103                 return PTR_ERR(file); 
    150104   
    150105 -       if (vma->vm_file) 
    150106 -               fput(vma->vm_file); 
    150107 -       vma->vm_file = file; 
    150108 -       vma->vm_ops = &shmem_vm_ops; 
    150109 +       shmem_set_file(vma, file); 
    150110 + 
    150111         return 0; 
    150112  } 
    150113150082Index: linux-2.6.28/mm/tiny-shmem.c 
    150114150083=================================================================== 
Note: See TracChangeset for help on using the changeset viewer.