1 files changed, 8 insertions, 2 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 70db597d6fd4..2c2e56bd8913 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1130,7 +1130,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;
@@ -1839,7 +1842,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);