diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-09 06:05:15 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-09 06:05:15 +0000 |
| commit | 6749db4d0fb9858b6e856c54548ff60bd455b140 (patch) | |
| tree | 12428281757455194fc9b5e14ef66f309f059105 /target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch | |
| parent | 99fcf7be6070955d91db2ef391bbcf5dc91a0b64 (diff) | |
[kernel] generic-2.6/2.6.30: resync patches for 2.6.30-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15736 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch index 677738351..ab29c4a86 100644 --- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2602,6 +2602,16 @@ int shmem_unuse(swp_entry_t entry, struc +@@ -2606,6 +2606,16 @@ int shmem_unuse(swp_entry_t entry, struc /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2680,11 +2690,7 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2684,11 +2694,7 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); @@ -88,7 +88,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -2405,6 +2406,7 @@ int vmtruncate_range(struct inode *inode +@@ -2438,6 +2439,7 @@ int vmtruncate_range(struct inode *inode return 0; } @@ -98,7 +98,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1100,6 +1100,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1101,6 +1101,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -106,7 +106,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1213,6 +1214,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1214,6 +1215,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } |