Arnd Bergmann 7fe19da4ca preempt: fix kernel build with !CONFIG_BKL ... The preempt count logic tries to take the BKL into account, which breaks when CONFIG_BKL is not set. Use the same preempt_count offset that we use without CONFIG_PREEMPT when CONFIG_BKL is disabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reported-and-tested-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2010-11-02 08:39:13 -04:00
..
acpi	Merge branch 'misc' into release	2010-10-26 14:51:00 -04:00
asm-generic	audit: make link()/linkat() match "attribute change" predicate	2010-10-30 08:45:43 -04:00
crypto
drm
keys
linux	preempt: fix kernel build with !CONFIG_BKL	2010-11-02 08:39:13 -04:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-10-28 09:35:11 -07:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-29 14:17:12 -07:00
pcmcia
rdma
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-10-31 20:43:12 -04:00
sound
trace	Merge branch 'next' into upstream-merge	2010-10-27 23:44:47 -04:00
video	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-10-28 20:14:38 +01:00
xen	Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2010-10-28 17:11:17 -07:00
Kbuild