projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
kernel
/
rcu
/
update.c
diff --git
a/kernel/rcu/update.c
b/kernel/rcu/update.c
index ca828b41c938b24e5b11b33e421ea4b4e2366f1f..3ccdc8eebc5afff02707b7b20772e8b4f978486c 100644
(file)
--- a/
kernel/rcu/update.c
+++ b/
kernel/rcu/update.c
@@
-67,7
+67,7
@@
static int rcu_normal_after_boot;
module_param(rcu_normal_after_boot, int, 0);
#endif /* #ifndef CONFIG_TINY_RCU */
module_param(rcu_normal_after_boot, int, 0);
#endif /* #ifndef CONFIG_TINY_RCU */
-#if
defined(CONFIG_DEBUG_LOCK_ALLOC) && defined(CONFIG_PREEMPT_COUNT)
+#if
def CONFIG_DEBUG_LOCK_ALLOC
/**
* rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
*
/**
* rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
*
@@
-111,7
+111,7
@@
int rcu_read_lock_sched_held(void)
return 0;
if (debug_locks)
lockdep_opinion = lock_is_held(&rcu_sched_lock_map);
return 0;
if (debug_locks)
lockdep_opinion = lock_is_held(&rcu_sched_lock_map);
- return lockdep_opinion ||
preempt_count() != 0 || irqs_disabled
();
+ return lockdep_opinion ||
!preemptible
();
}
EXPORT_SYMBOL(rcu_read_lock_sched_held);
#endif
}
EXPORT_SYMBOL(rcu_read_lock_sched_held);
#endif