Merge 5.4-rc1 into android-mainline
Linux 5.4-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I15eec52df70f829acf81ff614a1c2a5fb443a4e0
This commit is contained in:
@@ -1134,7 +1134,10 @@ struct task_struct {
|
||||
|
||||
struct tlbflush_unmap_batch tlb_ubc;
|
||||
|
||||
struct rcu_head rcu;
|
||||
union {
|
||||
refcount_t rcu_users;
|
||||
struct rcu_head rcu;
|
||||
};
|
||||
|
||||
/* Cache last used pipe for splice(): */
|
||||
struct pipe_inode_info *splice_pipe;
|
||||
@@ -1843,7 +1846,10 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
|
||||
* running or not.
|
||||
*/
|
||||
#ifndef vcpu_is_preempted
|
||||
# define vcpu_is_preempted(cpu) false
|
||||
static inline bool vcpu_is_preempted(int cpu)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
|
||||
|
Reference in New Issue
Block a user