Merge commit '3cf2f34' into sched/core, to fix build error
authorIngo Molnar <mingo@kernel.org>
Thu, 12 Jun 2014 11:46:25 +0000 (13:46 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 12 Jun 2014 11:46:37 +0000 (13:46 +0200)
commit535560d841b2d54f31280e05e9c6ffd19da0c4e7
tree5320502c072284813f3d3d42412bd73e26130863
parentf602d0632755be4f7eddfdd6c0af13216790177b
parent3cf2f34e1a3d4d5ff209d087925cf950e52f4805
Merge commit '3cf2f34' into sched/core, to fix build error

Fix this dependency on the locking tree's smp_mb*() API changes:

  kernel/sched/idle.c:247:3: error: implicit declaration of function ‘smp_mb__after_atomic’ [-Werror=implicit-function-declaration]

Signed-off-by: Ingo Molnar <mingo@kernel.org>
20 files changed:
arch/metag/include/asm/barrier.h
drivers/gpu/drm/i915/i915_irq.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/target/target_core_device.c
drivers/target/target_core_transport.c
drivers/tty/n_tty.c
drivers/usb/serial/usb_wwan.c
fs/btrfs/ioctl.c
include/linux/interrupt.h
include/linux/sched.h
kernel/sched/core.c
kernel/sched/cpupri.c
mm/filemap.c
net/bluetooth/hci_event.c
net/core/dev.c
net/ipv4/tcp_output.c