Changeset 26377


Ignore:
Timestamp:
2011-03-30T18:43:23+02:00 (7 years ago)
Author:
mb
Message:

2.6.38 vm_exports.patch: Fix merge error introduced in r26332
Thanks to acoul for noticing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.38/980-vm_exports.patch

    r26332 r26377  
    22=================================================================== 
    33--- linux-2.6.38.2.orig/mm/shmem.c      2011-03-27 20:37:20.000000000 +0200 
    4 +++ linux-2.6.38.2/mm/shmem.c   2011-03-28 17:18:35.142293910 +0200 
     4+++ linux-2.6.38.2/mm/shmem.c   2011-03-30 18:23:12.296417197 +0200 
    55@@ -30,6 +30,7 @@ 
    66 #include <linux/module.h> 
     
    1111 static struct vfsmount *shm_mnt; 
    1212  
    13 @@ -2710,6 +2711,16 @@ out: 
     13@@ -2710,6 +2711,17 @@ out: 
    1414  
    1515 /* common code */ 
     
    2222+       vma->vm_file = file; 
    2323+       vma->vm_ops = &shmem_vm_ops; 
     24+       vma->vm_flags |= VM_CAN_NONLINEAR; 
    2425+} 
    2526+EXPORT_SYMBOL_GPL(shmem_set_file); 
     
    2829  * shmem_file_setup - get an unlinked file living in tmpfs 
    2930  * @name: name for dentry (to be seen in /proc/<pid>/maps 
    30 @@ -2787,10 +2798,7 @@ int shmem_zero_setup(struct vm_area_stru 
     31@@ -2787,10 +2799,7 @@ int shmem_zero_setup(struct vm_area_stru 
    3132        if (IS_ERR(file)) 
    3233                return PTR_ERR(file); 
     
    3637-       vma->vm_file = file; 
    3738-       vma->vm_ops = &shmem_vm_ops; 
     39-       vma->vm_flags |= VM_CAN_NONLINEAR; 
    3840+       shmem_set_file(vma, file); 
    39         vma->vm_flags |= VM_CAN_NONLINEAR; 
     41+ 
    4042        return 0; 
    4143 } 
     
    4345=================================================================== 
    4446--- linux-2.6.38.2.orig/fs/file.c       2011-03-27 20:37:20.000000000 +0200 
    45 +++ linux-2.6.38.2/fs/file.c    2011-03-28 17:18:24.755353654 +0200 
     47+++ linux-2.6.38.2/fs/file.c    2011-03-28 22:44:57.267151662 +0200 
    4648@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi 
    4749        /* All good, so we try */ 
     
    5557=================================================================== 
    5658--- linux-2.6.38.2.orig/kernel/exit.c   2011-03-27 20:37:20.000000000 +0200 
    57 +++ linux-2.6.38.2/kernel/exit.c        2011-03-28 17:18:24.755353654 +0200 
     59+++ linux-2.6.38.2/kernel/exit.c        2011-03-28 22:44:57.269151650 +0200 
    5860@@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st 
    5961  
     
    7577=================================================================== 
    7678--- linux-2.6.38.2.orig/kernel/fork.c   2011-03-27 20:37:20.000000000 +0200 
    77 +++ linux-2.6.38.2/kernel/fork.c        2011-03-28 17:18:24.755353654 +0200 
     79+++ linux-2.6.38.2/kernel/fork.c        2011-03-28 22:44:57.270151644 +0200 
    7880@@ -193,6 +193,7 @@ void __put_task_struct(struct task_struc 
    7981        if (!profile_handoff_task(tsk)) 
     
    8789=================================================================== 
    8890--- linux-2.6.38.2.orig/kernel/sched.c  2011-03-27 20:37:20.000000000 +0200 
    89 +++ linux-2.6.38.2/kernel/sched.c       2011-03-28 17:18:24.757353643 +0200 
     91+++ linux-2.6.38.2/kernel/sched.c       2011-03-28 22:44:57.274151620 +0200 
    9092@@ -4641,6 +4641,7 @@ int can_nice(const struct task_struct *p 
    9193        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 
     
    99101=================================================================== 
    100102--- linux-2.6.38.2.orig/mm/memory.c     2011-03-27 20:37:20.000000000 +0200 
    101 +++ linux-2.6.38.2/mm/memory.c  2011-03-28 17:18:24.757353643 +0200 
     103+++ linux-2.6.38.2/mm/memory.c  2011-03-28 22:44:57.277151603 +0200 
    102104@@ -1229,6 +1229,7 @@ unsigned long zap_page_range(struct vm_a 
    103105                tlb_finish_mmu(tlb, address, end); 
     
    119121=================================================================== 
    120122--- linux-2.6.38.2.orig/mm/vmalloc.c    2011-03-27 20:37:20.000000000 +0200 
    121 +++ linux-2.6.38.2/mm/vmalloc.c 2011-03-28 17:18:24.758353638 +0200 
     123+++ linux-2.6.38.2/mm/vmalloc.c 2011-03-28 22:44:57.278151598 +0200 
    122124@@ -1193,6 +1193,7 @@ void unmap_kernel_range(unsigned long ad 
    123125        vunmap_page_range(addr, end); 
     
    139141=================================================================== 
    140142--- linux-2.6.38.2.orig/include/linux/mm.h      2011-03-27 20:37:20.000000000 +0200 
    141 +++ linux-2.6.38.2/include/linux/mm.h   2011-03-28 17:18:24.758353638 +0200 
     143+++ linux-2.6.38.2/include/linux/mm.h   2011-03-28 22:44:57.279151592 +0200 
    142144@@ -863,6 +863,7 @@ extern void show_free_areas(void); 
    143145  
Note: See TracChangeset for help on using the changeset viewer.