Squashed update of kernel from 3.4.94 to 3.4.95
Revert "nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off"

This reverts commit 3f8f4ae48f4023e1c53722b1dc1a7ab897cbca14:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=3f8f4ae48f4023e1c53722b1dc1a7ab897cbca14

On CAF branches the following commit removed sleep_length member
from tick_sched struct:
tick-sched: recalculate sleep length each time it is requested
https://www.codeaurora.org/cgit/quic/la/kernel/msm/commit/?h=kk_2.7-stable&id=9feb87d70208e2236d24ef0ac2fa4d0e28e7d335
apache: Fix board build error
Squashed update of kernel from 3.4.95 to 3.4.96
block: bfq: Squashed update from BFQ-v7r4 to BFQ-v7r5

Change-Id: I749ef141246db7020cec0b10d980ec854a572603
misc: pmem: Support for dynamic allocation through CMA

A new member, named use_cma, has been added to the struct android_pmem_platform_data.
If use_cma is set to 1, the memory amount of PMEM heap will be dynamically
reserved and then released when it's no more needed through CMA api.
This solution is ready to be used with bitmap allocator.
msm7x30: Simplify the code for hybrid memory allocations on board side

Since we'll never use again PMEM for SF and audio, let's simplify
the code for hybrid memory allocations (ION + PMEM for ADSP).
msm7x30: Allow to optionally enable the use of CMA for ION MM and PMEM ADSP heaps

Add two new config options to enable or disable the use of CMA in order
to dynamically or statically allocate the memory needed by ION MM and
PMEM ADSP heaps.
msm7x30: Use CMA for PMEM ADSP

Dynamically allocate, through CMA, the memory needed by camera
and camcorder by setting use_cma = 1 for PMEM ADSP.
msm7x30: Update defconfigs

Enable the option to use CMA for ION MM heap and for PMEM ADSP heap.
Also remove extra hign memory configurations.
msm7x30: Use a higher memory allocation if CMA is used for ION MM heap

When CMA is used for ION MM heap, it could be required that a higher amount of
memory is temporarly allocated while starting the playback of some HD videos
or while re-encoding a long video before sending/sharing it with an app
(for example WhatsApp).