mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <linux/mm.h>
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/percpu_counter.h>
|
||||
#include <linux/swap.h>
|
||||
+#include <linux/ima.h>
|
||||
|
||||
static struct vfsmount *shm_mnt;
|
||||
|
||||
@@ -2675,6 +2676,16 @@ out:
|
||||
@@ -2702,6 +2703,16 @@ out:
|
||||
|
||||
/* common code */
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
/**
|
||||
* shmem_file_setup - get an unlinked file living in tmpfs
|
||||
* @name: name for dentry (to be seen in /proc/<pid>/maps
|
||||
@@ -2752,9 +2763,6 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
@@ -2779,9 +2790,6 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
if (IS_ERR(file))
|
||||
return PTR_ERR(file);
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
}
|
||||
--- a/fs/file.c
|
||||
+++ b/fs/file.c
|
||||
@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
|
||||
@@ -264,6 +264,7 @@ int expand_files(struct files_struct *fi
|
||||
/* All good, so we try */
|
||||
return expand_fdtable(files, nr);
|
||||
}
|
||||
@@ -76,7 +76,7 @@
|
||||
* macro override instead of weak attribute alias, to workaround
|
||||
--- a/kernel/sched.c
|
||||
+++ b/kernel/sched.c
|
||||
@@ -4261,6 +4261,7 @@ int can_nice(const struct task_struct *p
|
||||
@@ -4446,6 +4446,7 @@ int can_nice(const struct task_struct *p
|
||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||
capable(CAP_SYS_NICE));
|
||||
}
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
--- a/mm/memory.c
|
||||
+++ b/mm/memory.c
|
||||
@@ -1203,6 +1203,7 @@ unsigned long zap_page_range(struct vm_a
|
||||
@@ -1201,6 +1201,7 @@ unsigned long zap_page_range(struct vm_a
|
||||
tlb_finish_mmu(tlb, address, end);
|
||||
return end;
|
||||
}
|
||||
@@ -94,7 +94,7 @@
|
||||
|
||||
/**
|
||||
* zap_vma_ptes - remove ptes mapping the vma
|
||||
@@ -2615,6 +2616,7 @@ int vmtruncate_range(struct inode *inode
|
||||
@@ -2612,6 +2613,7 @@ int vmtruncate_range(struct inode *inode
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -104,7 +104,7 @@
|
||||
* We enter with non-exclusive mmap_sem (to exclude vma changes,
|
||||
--- a/mm/vmalloc.c
|
||||
+++ b/mm/vmalloc.c
|
||||
@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
|
||||
@@ -1177,6 +1177,7 @@ void unmap_kernel_range(unsigned long ad
|
||||
vunmap_page_range(addr, end);
|
||||
flush_tlb_kernel_range(addr, end);
|
||||
}
|
||||
@@ -112,7 +112,7 @@
|
||||
|
||||
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
|
||||
{
|
||||
@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
|
||||
@@ -1292,6 +1293,7 @@ struct vm_struct *get_vm_area(unsigned l
|
||||
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
|
||||
-1, GFP_KERNEL, __builtin_return_address(0));
|
||||
}
|
||||
@@ -122,7 +122,7 @@
|
||||
void *caller)
|
||||
--- a/include/linux/mm.h
|
||||
+++ b/include/linux/mm.h
|
||||
@@ -732,6 +732,7 @@ extern void show_free_areas(void);
|
||||
@@ -736,6 +736,7 @@ extern void show_free_areas(void);
|
||||
|
||||
int shmem_lock(struct file *file, int lock, struct user_struct *user);
|
||||
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
|
||||
|
||||
Reference in New Issue
Block a user