xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into sched/core

Browse Source 
Reason: Bring bakc upstream modification to resolve conflicts

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2014-02-21 21:36:40 +01:00
parent 3f67d962c6 d158fc7f36
commit d97a860c4f
998 changed files with 12841 additions and 6036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/sched.h
View File

@@ -130,6 +130,7 @@ struct bio_list;
struct fs_struct;
struct perf_event_context;
struct blk_plug;
struct filename;
/*
* List of flags we want to share for kernel threads,
@@ -2336,7 +2337,7 @@ extern void do_group_exit(int);
extern int allow_signal(int);
extern int disallow_signal(int);
extern int do_execve(const char *,
extern int do_execve(struct filename *,
const char __user * const __user *,
const char __user * const __user *);
extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *);