Romain Perier fba7cd681b asm-generic/futex: Re-enable preemption in futex_atomic_cmpxchg_inatomic() ... The recent decoupling of pagefault disable and preempt disable added an explicit preempt_disable/enable() pair to the futex_atomic_cmpxchg_inatomic() implementation in asm-generic/futex.h. But it forgot to add preempt_enable() calls to the error handling code pathes, which results in a preemption count imbalance. This is observable on boot when the test for atomic_cmpxchg() is calling futex_atomic_cmpxchg_inatomic() on a NULL pointer. Add the missing preempt_enable() calls to the error handling code pathes. [ tglx: Massaged changelog ] Fixes: d9b9ff8c18 ("sched/preempt, futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly") Signed-off-by: Romain Perier <romain.perier@free-electrons.com> Cc: linux-arch@vger.kernel.org Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1460640963-690-1-git-send-email-romain.perier@free-electrons.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2016-04-21 11:06:09 +02:00
..
acpi
asm-generic	asm-generic/futex: Re-enable preemption in futex_atomic_cmpxchg_inatomic()	2016-04-21 11:06:09 +02:00
clocksource
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-03-17 11:33:45 -07:00
drm	drm/ttm: use phys_addr_t for ttm_bus_placement	2016-04-04 17:00:01 -04:00
dt-bindings	The clk changes for this release cycle are mostly dominated by	2016-03-23 06:06:45 -07:00
keys
kvm
linux	USB fixes for 4.6-rc4	2016-04-16 20:48:14 -07:00
math-emu
media	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2016-03-19 16:31:54 -07:00
memory
misc
net	For the current RC series, we have the following fixes:	2016-04-08 16:41:28 -04:00
pcmcia
ras
rdma	Round two of 4.6 merge window patches	2016-03-22 15:48:44 -07:00
rxrpc
scsi	Merge branch 'fixes-base' into fixes	2016-04-05 06:56:47 -04:00
soc	IOMMU Updates for Linux v4.6	2016-03-22 11:57:43 -07:00
sound
target	target: add a new add_wwn_groups fabrics method	2016-03-30 20:06:44 -07:00
trace	Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2016-04-09 10:41:34 -07:00
uapi	USB fixes for 4.6-rc3	2016-04-09 12:23:02 -07:00
video	gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot	2016-03-31 11:24:33 +02:00
xen
Kbuild