git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sched: Isolate preempt counting in its own config option
[pandora-kernel.git]
/
include
/
linux
/
bit_spinlock.h
diff --git
a/include/linux/bit_spinlock.h
b/include/linux/bit_spinlock.h
index
b4326bf
..
564d997
100644
(file)
--- a/
include/linux/bit_spinlock.h
+++ b/
include/linux/bit_spinlock.h
@@
-88,7
+88,7
@@
static inline int bit_spin_is_locked(int bitnum, unsigned long *addr)
{
#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
return test_bit(bitnum, addr);
-#elif defined CONFIG_PREEMPT
+#elif defined CONFIG_PREEMPT
_COUNT
return preempt_count();
#else
return 1;