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

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

drm

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next

2010-10-26 09:23:22 +10:00

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

mtd: Define MLC Flash as a different flash type

2010-10-25 00:50:20 +01:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2010-10-29 14:17:12 -07:00

pcmcia

pcmcia: IOCARD is also required for using IRQs

2010-10-22 08:46:36 +02:00

rdma

IB/core: Add VLAN support for IBoE

2010-10-25 10:20:39 -07:00

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2010-10-25 08:32:05 -07:00

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

…