From f172085d658999199d104f99868466912b7bf546 Mon Sep 17 00:00:00 2001 From: Li Zhong Date: Mon, 7 Jan 2013 09:36:48 -0800 Subject: [PATCH] --- yaml --- r: 349804 b: refs/heads/master c: 347f42382184f7448fa96bf9e9fa4eb6f6d1099e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 3 --- trunk/kernel/rcutree.h | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7ea96e4b0b0d..bdf8375a9329 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f03e3ca74a7f8b17ce626d337d321163dce2dad +refs/heads/master: 347f42382184f7448fa96bf9e9fa4eb6f6d1099e diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index d78ba606acf1..8a13c8ef9642 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -2719,9 +2719,6 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->dynticks = &per_cpu(rcu_dynticks, cpu); WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE); WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1); -#ifdef CONFIG_RCU_USER_QS - WARN_ON_ONCE(rdp->dynticks->in_user); -#endif rdp->cpu = cpu; rdp->rsp = rsp; rcu_boot_init_nocb_percpu_data(rdp); diff --git a/trunk/kernel/rcutree.h b/trunk/kernel/rcutree.h index 4b69291b093d..6f21f2eccb16 100644 --- a/trunk/kernel/rcutree.h +++ b/trunk/kernel/rcutree.h @@ -102,10 +102,6 @@ struct rcu_dynticks { /* idle-period nonlazy_posted snapshot. */ int tick_nohz_enabled_snap; /* Previously seen value from sysfs. */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ -#ifdef CONFIG_RCU_USER_QS - bool ignore_user_qs; /* Treat userspace as extended QS or not */ - bool in_user; /* Is the CPU in userland from RCU POV? */ -#endif }; /* RCU's kthread states for tracing. */