mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22252 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
|
||||
static struct vfsmount *shm_mnt;
|
||||
|
||||
@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
|
||||
@@ -2675,6 +2676,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
|
||||
@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
@@ -2752,9 +2763,6 @@ int shmem_zero_setup(struct vm_area_stru
|
||||
if (IS_ERR(file))
|
||||
return PTR_ERR(file);
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
{
|
||||
--- a/kernel/exit.c
|
||||
+++ b/kernel/exit.c
|
||||
@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
|
||||
@@ -506,6 +506,7 @@ struct files_struct *get_files_struct(st
|
||||
|
||||
return files;
|
||||
}
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
void put_files_struct(struct files_struct *files)
|
||||
{
|
||||
@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
|
||||
@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
|
||||
rcu_read_unlock();
|
||||
}
|
||||
}
|
||||
@@ -66,7 +66,7 @@
|
||||
{
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -177,6 +177,7 @@ void __put_task_struct(struct task_struc
|
||||
@@ -190,6 +190,7 @@ void __put_task_struct(struct task_struc
|
||||
if (!profile_handoff_task(tsk))
|
||||
free_task(tsk);
|
||||
}
|
||||
@@ -76,7 +76,7 @@
|
||||
* macro override instead of weak attribute alias, to workaround
|
||||
--- a/kernel/sched.c
|
||||
+++ b/kernel/sched.c
|
||||
@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
|
||||
@@ -4271,6 +4271,7 @@ int can_nice(const struct task_struct *p
|
||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||
capable(CAP_SYS_NICE));
|
||||
}
|
||||
@@ -94,7 +94,7 @@
|
||||
|
||||
/**
|
||||
* zap_vma_ptes - remove ptes mapping the vma
|
||||
@@ -2596,6 +2597,7 @@ int vmtruncate_range(struct inode *inode
|
||||
@@ -2605,6 +2606,7 @@ int vmtruncate_range(struct inode *inode
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -122,7 +122,7 @@
|
||||
void *caller)
|
||||
--- a/include/linux/mm.h
|
||||
+++ b/include/linux/mm.h
|
||||
@@ -728,6 +728,7 @@ extern void show_free_areas(void);
|
||||
@@ -732,6 +732,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);
|
||||
@@ -132,7 +132,7 @@
|
||||
#ifndef CONFIG_MMU
|
||||
--- a/kernel/signal.c
|
||||
+++ b/kernel/signal.c
|
||||
@@ -1121,6 +1121,7 @@ struct sighand_struct *lock_task_sighand
|
||||
@@ -1124,6 +1124,7 @@ struct sighand_struct *lock_task_sighand
|
||||
|
||||
return sighand;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user