Peter Zijlstra 215393bc1f sched/preempt/x86: Fix voluntary preempt for x86 ... The #ifdef CONFIG_PREEMPT is both not needed and wrong. Its not required because asm/preempt.h should provide {set,clear}_preempt_need_resched() regardless and its wrong because for voluntary preempt we still rely on PREEMPT_NEED_RESCHED. Reported-and-Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de> Fixes: 8cb75e0c4e ("sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding") Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Dipankar Sarma <dipankar@in.ibm.com> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/20140122102435.GH31570@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mingo@kernel.org>		2014-01-23 14:48:35 +01:00
..
acpi	Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'	2013-12-31 22:03:37 +01:00
asm-generic	Linux 3.13-rc8	2014-01-13 11:44:41 +01:00
clocksource
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-09 19:58:52 +08:00
drm	drm/radeon: 0x9649 is SUMO2 not SUMO	2013-12-23 10:03:41 -05:00
dt-bindings	For the 3.13 merge window we have a couple of new drivers for the AMS	2013-11-15 16:37:40 -08:00
keys
kvm
linux	sched/preempt/x86: Fix voluntary preempt for x86	2014-01-23 14:48:35 +01:00
math-emu
media	[media] videobuf2: Add support for file access mode flags for DMABUF exporting	2013-12-09 14:50:50 -02:00
memory
misc
net	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 10:42:08 -08:00
pcmcia
ras
rdma	IB/core: const'ify inbuf in struct ib_udata	2013-12-16 10:38:28 -08:00
rxrpc
scsi	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
sound	ALSA: memalloc.h - fix wrong truncation of dma_addr_t	2013-12-10 15:30:46 +01:00
target	target/file: Update hw_max_sectors based on current block_size	2013-12-19 00:18:54 -08:00
trace	* Add the functionality to override error reporting agents as some	2013-12-16 14:33:17 +01:00
uapi	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 15:12:49 -08:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Nobody has been maintaining xen in ia64 for a long time.	2014-01-20 09:33:40 -08:00
Kbuild