Merge "msm: ipc_logging: Update function stubs"
Merge "msm: vidc: Fix codec config frame with EOS flag issue"
Merge "msm_fb: display: exit properly when rotator max session reached"
Merge "gpu: ion: Align va address to biggest buffer size"
Merge "gpio: msm-common: Fix irq_set_type for dual edge trigger"
Merge "usb: smd: Call smd_close API from workqueue context"
Merge "board-8960-gpiomux: Correct Primary UART GPIOs suspend configuration"
Merge "media: dvb: Remove write permission of other users to debug-fs"
Merge "msm_fb: Fix adb shell start/stop issue when bypass enabled"
Merge "msm_fb: Enable mdp clock during LVDS init."
Merge "msm: camera: Check for valid pcam before using it"
Merge "msm: camera: Set event data stat buffer to NULL after freeing"
video: msm: re-enable framebuffer splash screen

Also fix the big scary warning it gives (thanks detule!)

Change-Id: Ide4f92f209bccb4eb8b252ffe75a948f008687b5
hardlockup: detect hard lockups without NMIs using secondary cpus

Emulate NMIs on systems where they are not available by using timer
interrupts on other cpus.  Each cpu will use its softlockup hrtimer
to update a per-cpu timestamp and then check the timestamp on the
next cpu.

The emulation uses the softlockup threshold instead of the hardlockup
threshold because the implementation runs at the same resolution as
the softlockup detector.

This patch is useful on systems where the hardlockup detector is not
available due to a lack of NMIs, for example most ARM SoCs.
Without this patch any cpu stuck with interrupts disabled can
cause a hardware watchdog reset with no debugging information,
but with this patch the kernel can detect the lockup and panic,
which can result in useful debugging info.

Change-Id: I3e6de6da27183b2a0a73a390e394f95a945856d9
Signed-off-by: Colin Cross <ccross@android.com>