Merge branch 'android-4.4@8e53f7c' into branch 'msm-4.4'

This merge is done with '-s ours' strategy, because same changes
was already arrived through merged linaro's LSK tags. The reason
for these duplicates is that from some point in 2016 Linaro
changed policy of taking changes from android-4.4 via merge with
cherry-pick instead. The only discarded QC change is:

  ffff87b kernel/watchdog.c: fix compilation warning on Kernel 4.4

* refs/heads/tmp-8e53f7c
  sched: tune: Fix lacking spinlock initialization
  UPSTREAM: trace: Update documentation for mono, mono_raw and boot clock
  UPSTREAM: trace: Add an option for boot clock as trace clock
  UPSTREAM: timekeeping: Add a fast and NMI safe boot clock
  ANDROID: goldfish_pipe: fix allmodconfig build
  ANDROID: goldfish: goldfish_pipe: fix locking errors
  ANDROID: video: goldfishfb: fix platform_no_drv_owner.cocci warnings
  ANDROID: goldfish_pipe: fix call_kern.cocci warnings
  arm64: rename ranchu defconfig to ranchu64
  ANDROID: arch: x86: disable pic for Android toolchain
  ANDROID: goldfish_pipe: An implementation of more parallel pipe
  ANDROID: goldfish_pipe: bugfixes and performance improvements.
  ANDROID: goldfish: Add goldfish sync driver
  ANDROID: goldfish: add ranchu defconfigs
  ANDROID: goldfish_audio: Clear audio read buffer status after each read
  ANDROID: goldfish_events: no extra EV_SYN; register goldfish
  ANDROID: goldfish_fb: Set pixclock = 0
  ANDROID: goldfish: Enable ACPI-based enumeration for goldfish audio
  ANDROID: goldfish: Enable ACPI-based enumeration for goldfish framebuffer
  ANDROID: video: goldfishfb: add devicetree bindings
  BACKPORT: staging: goldfish: audio: fix compiliation on arm
  BACKPORT: Input: goldfish_events - enable ACPI-based enumeration for goldfish events
  BACKPORT: goldfish: Enable ACPI-based enumeration for goldfish battery
  BACKPORT: drivers: tty: goldfish: Add device tree bindings
  BACKPORT: tty: goldfish: support platform_device with id -1
  BACKPORT: Input: goldfish_events - add devicetree bindings
  BACKPORT: power: goldfish_battery: add devicetree bindings
  BACKPORT: staging: goldfish: audio: add devicetree bindings
  ANDROID: usb: gadget: function: cleanup: Add blank line after declaration
  cpufreq: sched: Fix kernel crash on accessing sysfs file
  UPSTREAM: ring-buffer: Prevent overflow of size in ring_buffer_resize()
  usb: gadget: f_mtp: simplify ptp NULL pointer check
  ANDROID: video: adf: Avoid directly referencing user pointers
  ANDROID: usb: gadget: audio_source: fix comparison of distinct pointer types
  android: binder: support for file-descriptor arrays.
  android: binder: support for scatter-gather.
  android: binder: add extra size to allocator.
  android: binder: refactor binder_transact()
  android: binder: support multiple /dev instances.
  android: binder: deal with contexts in debugfs.
  android: binder: support multiple context managers.
  android: binder: split flat_binder_object.
  disable aio support in recommended configuration
  [RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions
  UPSTREAM: cpu/hotplug: Handle unbalanced hotplug enable/disable
  UPSTREAM: arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y
  UPSTREAM: arm64: kaslr: keep modules close to the kernel when DYNAMIC_FTRACE=y
  cgroup: Remove leftover instances of allow_attach
  BACKPORT: lib: harden strncpy_from_user
  CHROMIUM: cgroups: relax permissions on moving tasks between cgroups
  CHROMIUM: remove Android's cgroup generic permissions checks
  UPSTREAM: arm64: relocatable: deal with physically misaligned kernel images
  UPSTREAM: arm64: account for sparsemem section alignment when choosing vmemmap offset
  UPSTREAM: percpu: fix synchronization between synchronous map extension and chunk destruction
  UPSTREAM: percpu: fix synchronization between chunk->map_extend_work and chunk destruction
  ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
  ANDROID: binder: Add strong ref checks
  UPSTREAM: staging/android/ion : fix a race condition in the ion driver
  ANDROID: android-base: CONFIG_HARDENED_USERCOPY=y
  UPSTREAM: fs/proc/kcore.c: Add bounce buffer for ktext data
  UPSTREAM: fs/proc/kcore.c: Make bounce buffer global for read
  BACKPORT: arm64: Correctly bounds check virt_addr_valid
  BACKPORT: arm64: mm: Mark .rodata as RO
  Fix a build breakage in IO latency hist code.
  UPSTREAM: efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap
  UPSTREAM: ia64: split off early_ioremap() declarations into asm/early_ioremap.h
  FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN
  FROMLIST: arm64: xen: Enable user access before a privcmd hvc call
  FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled
  FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution
  FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1
  FROMLIST: arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro
  FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
  UPSTREAM: arm64: Handle el1 synchronous instruction aborts cleanly
  BACKPORT: arm64: kernel: Save and restore UAO and addr_limit on exception entry
  UPSTREAM: arm64: include alternative handling in dcache_by_line_op
  UPSTREAM: arm64: fix "dc cvau" cache operation on errata-affected core
  UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros"
  UPSTREAM: arm64: Add new asm macro copy_page
  UPSTREAM: arm64: kill ESR_LNX_EXEC
  UPSTREAM: arm64: add macro to extract ESR_ELx.EC
  UPSTREAM: arm64: mm: mark fault_info table const
  UPSTREAM: arm64: fix dump_instr when PAN and UAO are in use
  BACKPORT: arm64: Fold proc-macros.S into assembler.h
  UPSTREAM: arm64: introduce mov_q macro to move a constant into a 64-bit register
  UPSTREAM: arm64: Implement ptep_set_access_flags() for hardware AF/DBM
  UPSTREAM: arm64: choose memstart_addr based on minimum sparsemem section alignment
  UPSTREAM: arm64/mm: ensure memstart_addr remains sufficiently aligned
  UPSTREAM: arm64/kernel: fix incorrect EL0 check in inv_entry macro
  UPSTREAM: arm64: Add workaround for Cavium erratum 27456
  UPSTREAM: arm64: Add macros to read/write system registers
  UPSTREAM: arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM
  UPSTREAM: arm64/efi: split off EFI init and runtime code for reuse by 32-bit ARM
  UPSTREAM: arm64/efi: mark UEFI reserved regions as MEMBLOCK_NOMAP
  BACKPORT: arm64: only consider memblocks with NOMAP cleared for linear mapping
  UPSTREAM: mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory table
  ANDROID: dm: android-verity: Remove fec_header location constraint
  BACKPORT: audit: consistently record PIDs with task_tgid_nr()
  android-base.cfg: Enable kernel ASLR
  UPSTREAM: vmlinux.lds.h: allow arch specific handling of ro_after_init data section
  UPSTREAM: ARM/vdso: Mark the vDSO code read-only after init
  UPSTREAM: x86/vdso: Mark the vDSO code read-only after init
  UPSTREAM: lkdtm: Verify that '__ro_after_init' works correctly
  UPSTREAM: arch: Introduce post-init read-only memory
  UPSTREAM: x86/mm: Always enable CONFIG_DEBUG_RODATA and remove the Kconfig option
  UPSTREAM: mm/init: Add 'rodata=off' boot cmdline parameter to disable read-only kernel mappings
  UPSTREAM: asm-generic: Consolidate mark_rodata_ro()
  UPSTREAM: arm64: spinlock: fix spin_unlock_wait for LSE atomics
  UPSTREAM: arm64: avoid TLB conflict with CONFIG_RANDOMIZE_BASE
  UPSTREAM: arm64: Only select ARM64_MODULE_PLTS if MODULES=y
  UPSTREAM: arm64: kasan: Use actual memory node when populating the kernel image shadow
  UPSTREAM: arm64: lse: deal with clobbered IP registers after branch via PLT
  UPSTREAM: arm64: mm: check at build time that PAGE_OFFSET divides the VA space evenly
  UPSTREAM: arm64: kasan: Fix zero shadow mapping overriding kernel image shadow
  UPSTREAM: arm64: consistently use p?d_set_huge
  UPSTREAM: arm64: fix KASLR boot-time I-cache maintenance
  UPSTREAM: arm64: hugetlb: partial revert of 66b3923a1a0f
  UPSTREAM: arm64: make irq_stack_ptr more robust
  UPSTREAM: arm64: efi: invoke EFI_RNG_PROTOCOL to supply KASLR randomness
  UPSTREAM: efi: stub: use high allocation for converted command line
  UPSTREAM: efi: stub: add implementation of efi_random_alloc()
  BACKPORT: efi: stub: implement efi_get_random_bytes() based on EFI_RNG_PROTOCOL
  BACKPORT: arm64: kaslr: randomize the linear region
  UPSTREAM: arm64: mm: treat memstart_addr as a signed quantity
  UPSTREAM: arm64: vmemmap: use virtual projection of linear region
  BACKPORT: arm64: add support for kernel ASLR
  UPSTREAM: arm64: add support for building vmlinux as a relocatable PIE binary
  UPSTREAM: arm64: switch to relative exception tables
  UPSTREAM: extable: add support for relative extables to search and sort routines
  UPSTREAM: scripts/sortextable: add support for ET_DYN binaries
  UPSTREAM: arm64: futex.h: Add missing PAN toggling
  UPSTREAM: arm64: make asm/elf.h available to asm files
  UPSTREAM: arm64: avoid dynamic relocations in early boot code
  UPSTREAM: arm64: avoid R_AARCH64_ABS64 relocations for Image header fields
  UPSTREAM: arm64: add support for module PLTs
  UPSTREAM: arm64: move brk immediate argument definitions to separate header
  UPSTREAM: arm64: mm: use bit ops rather than arithmetic in pa/va translations
  UPSTREAM: arm64: mm: only perform memstart_addr sanity check if DEBUG_VM
  UPSTREAM: arm64: User die() instead of panic() in do_page_fault()
  UPSTREAM: arm64: allow kernel Image to be loaded anywhere in physical memory
  UPSTREAM: arm64: defer __va translation of initrd_start and initrd_end
  UPSTREAM: arm64: move kernel image to base of vmalloc area
  BACKPORT: arm64: kvm: deal with kernel symbols outside of linear mapping
  UPSTREAM: arm64: decouple early fixmap init from linear mapping
  UPSTREAM: arm64: pgtable: implement static [pte|pmd|pud]_offset variants
  UPSTREAM: arm64: introduce KIMAGE_VADDR as the virtual base of the kernel region
  BACKPORT: arm64: add support for ioremap() block mappings
  BACKPORT: arm64: prevent potential circular header dependencies in asm/bug.h
  UPSTREAM: of/fdt: factor out assignment of initrd_start/initrd_end
  UPSTREAM: of/fdt: make memblock minimum physical address arch configurable
  UPSTREAM: arm64: Remove the get_thread_info() function
  BACKPORT: arm64: kernel: Don't toggle PAN on systems with UAO
  UPSTREAM: arm64: cpufeature: Test 'matches' pointer to find the end of the list
  UPSTREAM: arm64: kernel: Add support for User Access Override
  UPSTREAM: arm64: add ARMv8.2 id_aa64mmfr2 boiler plate
  UPSTREAM: arm64: cpufeature: Change read_cpuid() to use sysreg's mrs_s macro
  UPSTREAM: arm64: use local label prefixes for __reg_num symbols
  UPSTREAM: arm64: vdso: Mark vDSO code as read-only
  UPSTREAM: arm64: ubsan: select ARCH_HAS_UBSAN_SANITIZE_ALL
  UPSTREAM: arm64: ptdump: Indicate whether memory should be faulting
  UPSTREAM: arm64: Add support for ARCH_SUPPORTS_DEBUG_PAGEALLOC
  UPSTREAM: arm64: mm: avoid calling apply_to_page_range on empty range
  UPSTREAM: arm64: Drop alloc function from create_mapping
  UPSTREAM: arm64: prefetch: add missing #include for spin_lock_prefetch
  UPSTREAM: arm64: lib: patch in prfm for copy_page if requested
  UPSTREAM: arm64: lib: improve copy_page to deal with 128 bytes at a time
  UPSTREAM: arm64: prefetch: add alternative pattern for CPUs without a prefetcher
  UPSTREAM: arm64: prefetch: don't provide spin_lock_prefetch with LSE
  UPSTREAM: arm64: allow vmalloc regions to be set with set_memory_*
  BACKPORT: arm64: kernel: implement ACPI parking protocol
  sched: Add Kconfig option DEFAULT_USE_ENERGY_AWARE to set ENERGY_AWARE feature flag
  sched/fair: remove printk while schedule is in progress
  ANDROID: fs: FS tracepoints to track IO.
  sched/walt: Drop arch-specific timer access
  ANDROID: fiq_debugger: Pass task parameter to unwind_frame()
  eas/sched/fair: Fixing comments in find_best_target.
  input: keyreset: switch to orderly_reboot
  UPSTREAM: tun: fix transmit timestamp support
  BACKPORT: arm64: mm: create new fine-grained mappings at boot
  BACKPORT: arm64: ensure _stext and _etext are page-aligned
  UPSTREAM: arm64: mm: allow passing a pgdir to alloc_init_*
  UPSTREAM: arm64: mm: allocate pagetables anywhere
  UPSTREAM: arm64: mm: use fixmap when creating page tables
  UPSTREAM: arm64: mm: add functions to walk tables in fixmap
  UPSTREAM: arm64: mm: add __{pud,pgd}_populate
  UPSTREAM: arm64: mm: avoid redundant __pa(__va(x))
  UPSTREAM: arm64: mm: add functions to walk page tables by PA
  UPSTREAM: arm64: mm: move pte_* macros
  UPSTREAM: arm64: kasan: avoid TLB conflicts
  UPSTREAM: arm64: mm: add code to safely replace TTBR1_EL1
  UPSTREAM: arm64: add function to install the idmap
  UPSTREAM: arm64: unmap idmap earlier
  UPSTREAM: arm64: unify idmap removal
  UPSTREAM: arm64: mm: place empty_zero_page in bss
  UPSTREAM: arm64: mm: specialise pagetable allocators
  UPSTREAM: asm-generic: Fix local variable shadow in __set_fixmap_offset
  BACKPORT: Eliminate the .eh_frame sections from the aarch64 vmlinux and kernel modules
  UPSTREAM: arm64: Fix an enum typo in mm/dump.c
  UPSTREAM: arm64: kasan: ensure that the KASAN zero page is mapped read-only
  UPSTREAM: arch/arm/include/asm/pgtable-3level.h: add pmd_mkclean for THP
  UPSTREAM: arm64: hide __efistub_ aliases from kallsyms
  UPSTREAM: arm64: head.S: use memset to clear BSS
  UPSTREAM: efi: stub: define DISABLE_BRANCH_PROFILING for all architectures
  UPSTREAM: arm64: entry: remove pointless SPSR mode check
  UPSTREAM: arm64: mm: move pgd_cache initialisation to pgtable_cache_init
  UPSTREAM: arm64: traps: address fallout from printk -> pr_* conversion
  UPSTREAM: arm64: ftrace: fix a stack tracer's output under function graph tracer
  UPSTREAM: arm64: pass a task parameter to unwind_frame()
  UPSTREAM: arm64: ftrace: modify a stack frame in a safe way
  UPSTREAM: arm64: remove irq_count and do_softirq_own_stack()
  UPSTREAM: arm64: hugetlb: add support for PTE contiguous bit
  BACKPORT: arm64: Use PoU cache instr for I/D coherency
  BACKPORT: arm64: kernel: fix architected PMU registers unconditional access
  UPSTREAM: arm64: Defer dcache flush in __cpu_copy_user_page
  UPSTREAM: arm64: reduce stack use in irq_handler
  UPSTREAM: arm64: Documentation: add list of software workarounds for errata
  UPSTREAM: arm64: mm: place __cpu_setup in .text
  UPSTREAM: arm64: cmpxchg: Don't incldue linux/mmdebug.h
  UPSTREAM: arm64: mm: fold alternatives into .init
  BACKPORT: arm64: Remove redundant padding from linker script
  UPSTREAM: arm64: mm: remove pointless PAGE_MASKing
  net: inet: diag: expose the socket mark to privileged processes.
  net: diag: make udp_diag_destroy work for mapped addresses.
  net: diag: support SOCK_DESTROY for UDP sockets
  net: diag: allow socket bytecode filters to match socket marks
  net: diag: slightly refactor the inet_diag_bc_audit error checks.
  net: diag: Add support to filter on device index
  UPSTREAM: arm64: don't call C code with el0's fp register
  UPSTREAM: arm64: when walking onto the task stack, check sp & fp are in current->stack
  UPSTREAM: arm64: Add this_cpu_ptr() assembler macro for use in entry.S
  UPSTREAM: arm64: irq: fix walking from irq stack to task stack
  UPSTREAM: arm64: Add do_softirq_own_stack() and enable irq_stacks
  UPSTREAM: arm64: Modify stack trace and dump for use with irq_stack
  UPSTREAM: arm64: Store struct thread_info in sp_el0
  UPSTREAM: arm64: Add trace_hardirqs_off annotation in ret_to_user
  UPSTREAM: arm64: ftrace: fix the comments for ftrace_modify_code
  UPSTREAM: arm64: ftrace: stop using kstop_machine to enable/disable tracing
  UPSTREAM: arm64: spinlock: serialise spin_unlock_wait against concurrent lockers
  UPSTREAM: arm64: enable HAVE_IRQ_TIME_ACCOUNTING
  UPSTREAM: arm64: fix COMPAT_SHMLBA definition for large pages
  UPSTREAM: arm64: add __init/__initdata section marker to some functions/variables
  UPSTREAM: usb: gadget: f_fs: Fix use-after-free
  UPSTREAM: brcmfmac: avoid potential stack overflow in brcmf_cfg80211_start_ap()
  UPSTREAM: arm64: pgtable: implement pte_accessible()
  UPSTREAM: arm64: mm: allow sections for unaligned bases
  UPSTREAM: arm64: mm: detect bad __create_mapping uses
  UPSTREAM: x86: fix SMAP in 32-bit environments
  UPSTREAM: audit: fix a double fetch in audit_log_single_execve_arg()
  UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor
  FIXUP: sched/tune: update accouting before CPU capacity
  FIXUP: sched/tune: add fixes missing from a previous patch
  arm: Fix #if/#ifdef typo in topology.c
  arm: Fix build error "conflicting types for 'scale_cpu_capacity'"
  sched/walt: use do_div instead of division operator
  DEBUG: cpufreq: fix cpu_capacity tracing build for non-smp systems
  UPSTREAM: ALSA: usb-audio: Fix double-free in error paths after snd_usb_add_audio_stream() call
  BACKPORT: ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
  sched/walt: include missing header for arm_timer_read_counter()
  cpufreq: Kconfig: Fixup incorrect selection by CPU_FREQ_DEFAULT_GOV_SCHED
  FROMLIST: pstore: drop pmsg bounce buffer
  UPSTREAM: usercopy: remove page-spanning test for now
  UPSTREAM: usercopy: force check_object_size() inline
  BACKPORT: usercopy: fold builtin_const check into inline function
  UPSTREAM: x86/uaccess: force copy_*_user() to be inlined
  UPSTREAM: HID: core: prevent out-of-bound readings
  UPSTREAM: block: fix use-after-free in sys_ioprio_get()
  Android: Fix build breakages.
  UPSTREAM: tty: Prevent ldisc drivers from re-using stale tty fields
  UPSTREAM: netfilter: nfnetlink: correctly validate length of batch messages
  cpuset: Make cpusets restore on hotplug
  UPSTREAM: mm/slub: support left redzone
  UPSTREAM: x86: reorganize SMAP handling in user space accesses
  UPSTREAM: Make the hardened user-copy code depend on having a hardened allocator
  Android: MMC/UFS IO Latency Histograms.
  UPSTREAM: usercopy: fix overlap check for kernel text
  UPSTREAM: usercopy: avoid potentially undefined behavior in pointer math
  UPSTREAM: mm: SLUB hardened usercopy support
  UPSTREAM: mm: SLAB hardened usercopy support
  BACKPORT: arm64/uaccess: Enable hardened usercopy
  BACKPORT: ARM: uaccess: Enable hardened usercopy
  BACKPORT: x86/uaccess: Enable hardened usercopy
  BACKPORT: mm: Hardened usercopy
  BACKPORT: mm: Implement stack frame object validation
  UPSTREAM: mm: Add is_migrate_cma_page
  UPSTREAM: unsafe_[get|put]_user: change interface to use a error target label
  BACKPORT: arm64: mm: fix location of _etext
  BACKPORT: ARM: 8583/1: mm: fix location of _etext
  UPSTREAM: Use the new batched user accesses in generic user string handling
  UPSTREAM: Add 'unsafe' user access functions for batched accesses
  BACKPORT: Don't show empty tag stats for unprivileged uids
  UPSTREAM: tcp: fix use after free in tcp_xmit_retransmit_queue()
  ANDROID: base-cfg: drop SECCOMP_FILTER config
  UPSTREAM: proc: prevent accessing /proc/<PID>/environ until it's ready
  UPSTREAM: [media] xc2028: unlock on error in xc2028_set_config()
  UPSTREAM: [media] xc2028: avoid use after free
  UPSTREAM: block: fix use-after-free in seq file
  UPSTREAM: assoc_array: don't call compare_object() on a node
  ANDROID: base-cfg: enable SECCOMP config
  ANDROID: rcu_sync: Export rcu_sync_lockdep_assert
  UPSTREAM: USB: cdc-acm: more sanity checking
  UPSTREAM: USB: iowarrior: fix oops with malicious USB descriptors
  UPSTREAM: USB: usb_driver_claim_interface: add sanity checking
  UPSTREAM: USB: mct_u232: add sanity checking in probe
  UPSTREAM: USB: cypress_m8: add endpoint sanity check
  UPSTREAM: Input: powermate - fix oops with malicious USB descriptors
  BACKPORT: tcp: enable per-socket rate limiting of all 'challenge acks'
  RFC: FROMLIST: cgroup: reduce read locked section of cgroup_threadgroup_rwsem during fork
  RFC: FROMLIST: cgroup: avoid synchronize_sched() in __cgroup_procs_write()
  RFC: FROMLIST: locking/percpu-rwsem: Optimize readers and reduce global impact
  net: ipv6: Fix ping to link-local addresses.
  ipv6: fix endianness error in icmpv6_err
  ANDROID: dm: android-verity: Allow android-verity to be compiled as an independent module
  Revert "Android: MMC/UFS IO Latency Histograms."
  Android: MMC/UFS IO Latency Histograms.
  UPSTREAM: af_unix: Guard against other == sk in unix_dgram_sendmsg
  UPSTREAM: ALSA: timer: Fix race among timer ioctls
  UPSTREAM: tcp: make challenge acks less predictable
  sched/fair: Avoid redundant idle_cpu() call in update_sg_lb_stats()
  FIXUP: sched: scheduler-driven cpu frequency selection
  UPSTREAM: usb: gadget: configfs: add mutex lock before unregister gadget
  ANDROID: dm-verity: adopt changes made to dm callbacks
  UPSTREAM: ecryptfs: fix handling of directory opening
  UPSTREAM: ecryptfs: don't allow mmap when the lower fs doesn't support it
  UPSTREAM: Revert "ecryptfs: forbid opening files without mmap handler"
  ANDROID: net: core: fix UID-based routing
  ANDROID: net: fib: remove duplicate assignment
  FROMLIST: proc: Fix timerslack_ns CAP_SYS_NICE check when adjusting self
  sched/rt: Add Kconfig option to enable panicking for RT throttling
  sched/rt: print RT tasks when RT throttling is activated
  UPSTREAM: sched: Fix a race between __kthread_bind() and sched_setaffinity()
  sched/fair: Favor higher cpus only for boosted tasks
  vmstat: make vmstat_updater deferrable again and shut down on idle
  sched/fair: call OPP update when going idle after migration
  sched/cpufreq_sched: fix thermal capping events
  sched/fair: Picking cpus with low OPPs for tasks that prefer idle CPUs
  FIXUP: sched/tune: do initialization as a postcore_initicall
  DEBUG: sched: add tracepoint for RD overutilized
  sched/tune: Introducing a new schedtune attribute prefer_idle
  sched: use util instead of capacity to select busy cpu
  arch_timer: add error handling when the MPM global timer is cleared
  FIXUP: sched: Fix double-release of spinlock in move_queued_task
  FIXUP: sched/fair: Fix hang during suspend in sched_group_energy
  FIXUP: sched: fix SchedFreq integration for both PELT and WALT
  sched: EAS: Avoid causing spikes to max-freq unnecessarily
  FIXUP: sched: fix set_cfs_cpu_capacity when WALT is in use
  sched/walt: Accounting for number of irqs pending on each core
  sched: Introduce Window Assisted Load Tracking (WALT)
  sched/tune: fix PB and PC cuts indexes definition
  sched/fair: optimize idle cpu selection for boosted tasks
  FIXUP: sched/tune: fix accounting for runnable tasks
  sched/tune: use a single initialisation function
  sched/{fair,tune}: simplify fair.c code
  FIXUP: sched/tune: fix payoff calculation for boost region
  sched/tune: Add support for negative boost values
  FIX: sched/tune: move schedtune_nornalize_energy into fair.c
  FIX: sched/tune: update usage of boosted task utilisation on CPU selection
  sched/fair: add tunable to set initial task load
  sched/fair: add tunable to force selection at cpu granularity
  sched: EAS: take cstate into account when selecting idle core
  sched/cpufreq_sched: Consolidated update
  FIXUP: sched: fix build for non-SMP target
  DEBUG: sched/tune: add tracepoint on P-E space filtering
  DEBUG: sched/tune: add tracepoint for energy_diff() values
  DEBUG: sched/tune: add tracepoint for task boost signal
  arm: topology: Define TC2 energy and provide it to the scheduler
  CHROMIUM: sched: update the average of nr_running
  ANDROID: dm verity fec: pack the fec_header structure
  ANDROID: dm: android-verity: Verify header before fetching table
  ANDROID: dm: allow adb disable-verity only in userdebug
  ANDROID: dm: mount as linear target if eng build
  ANDROID: dm: use default verity public key
  ANDROID: dm: fix signature verification flag
  ANDROID: dm: use name_to_dev_t
  ANDROID: dm: rename dm-linear methods for dm-android-verity
  ANDROID: dm: Minor cleanup
  ANDROID: dm: Mounting root as linear device when verity disabled
  ANDROID: dm-android-verity: Rebase on top of 4.1
  ANDROID: dm: Add android verity target
  ANDROID: dm: fix dm_substitute_devices()
  ANDROID: dm: Rebase on top of 4.1
  CHROMIUM: dm: boot time specification of dm=
  UPSTREAM: net: Fix use after free in the recvmmsg exit path
  Implement memory_state_time, used by qcom,cpubw
  Revert "panic: Add board ID to panic output"
  usb: gadget: f_accessory: remove duplicate endpoint alloc
  BACKPORT: brcmfmac: defer DPC processing during probe
  FROMLIST: proc: Add LSM hook checks to /proc/<tid>/timerslack_ns
  FROMLIST: proc: Relax /proc/<tid>/timerslack_ns capability requirements
  UPSTREAM: sched: panic on corrupted stack end
  UPSTREAM: ecryptfs: forbid opening files without mmap handler
  UPSTREAM: proc: prevent stacking filesystems on top
  UPSTREAM: ppp: defer netns reference release for ppp channel
  cpuset: Add allow_attach hook for cpusets on android.
  Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic"
  CHROMIUM: android: binder: Fix potential scheduling-while-atomic
  UPSTREAM: netfilter: x_tables: make sure e->next_offset covers remaining blob size
  UPSTREAM: netfilter: x_tables: validate e->target_offset early
  UPSTREAM: KEYS: potential uninitialized variable
  UPSTREAM: KEYS: Fix ASN.1 indefinite length object parsing
  UPSTREAM: ppp: take reference on channels netns
  UPSTREAM: netfilter: x_tables: fix unconditional helper
  ANDROID: sdcardfs: fix itnull.cocci warnings
  android-recommended.cfg: enable fstack-protector-strong
  sdcardfs: Truncate packages_gid.list on overflow
  UPSTREAM: cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind
  BACKPORT: ptrace: use fsuid, fsgid, effective creds for fs access checks
  BACKPORT: proc: add /proc/<pid>/timerslack_ns interface
  BACKPORT: timer: convert timer_slack_ns from unsigned long to u64
  netfilter: xt_quota2: make quota2_log work well
  Revert "usb: gadget: prevent change of Host MAC address of 'usb0' interface"
  BACKPORT: PM / sleep: Go direct_complete if driver has no callbacks
  ANDROID: base-cfg: enable UID_CPUTIME
  UPSTREAM: USB: usbfs: fix potential infoleak in devio
  UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_ccallback
  UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
  UPSTREAM: ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS
  UPSTREAM: net: fix infoleak in rtnetlink
  ANDROID: configs: remove unused configs
  ANDROID: cpu: send KOBJ_ONLINE event when enabling cpus
  UPSTREAM: usbnet: cleanup after bind() in probe()
  ANDROID: dm verity fec: initialize recursion level
  ANDROID: dm verity fec: fix RS block calculation
  ANDROID: dm verity fec: add missing release from fec_ktype
  ANDROID: dm verity fec: limit error correction recursion
  ANDROID: restrict access to perf events
  FROMLIST: security,perf: Allow further restriction of perf_event_open
  BACKPORT: perf tools: Document the perf sysctls
  UPSTREAM: arm64: module: avoid undefined shift behavior in reloc_data()
  UPSTREAM: arm64: module: fix relocation of movz instruction with negative immediate
  Revert "armv6 dcc tty driver"
  Revert "arm: dcc_tty: fix armv6 dcc tty build failure"
  ARM64: Ignore Image-dtb from git point of view
  arm64: add option to build Image-dtb
  ANDROID: usb: gadget: f_midi: set fi->f to NULL when free f_midi function
  UPSTREAM: mac80211: fix "warning: ‘target_metric’ may be used uninitialized"
  UPSTREAM: tty: Fix unsafe ldisc reference via ioctl(TIOCGETD)
  Revert "drivers: power: use 'current' instead of 'get_current()'"
  cpufreq: interactive: drop cpufreq_{get,put}_global_kobject func calls
  Revert "cpufreq: interactive: build fixes for 4.4"
  xt_qtaguid: Fix panic caused by processing non-full socket.
  fiq_debugger: Add fiq_debugger.disable option
  UPSTREAM: procfs: fixes pthread cross-thread naming if !PR_DUMPABLE
  FROMLIST: wlcore: Disable filtering in AP role
  Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend."
  DEBUG: schedtune: add tracepoint for schedtune_tasks_update() values
  DEBUG: schedtune: add tracepoint for CPU boost signal
  DEBUG: schedtune: add tracepoint for SchedTune configuration update
  DEBUG: sched: add energy procfs interface
  DEBUG: sched,cpufreq: add cpu_capacity change tracepoint
  DEBUG: sched: add tracepoint for CPU load/util signals
  DEBUG: sched: add tracepoint for task load/util signals
  DEBUG: sched: add tracepoint for cpu/freq scale invariance
  sched/fair: filter energy_diff() based on energy_payoff value
  sched/tune: add support to compute normalized energy
  sched/fair: keep track of energy/capacity variations
  sched/fair: add boosted task utilization
  sched/{fair,tune}: track RUNNABLE tasks impact on per CPU boost value
  sched/tune: compute and keep track of per CPU boost value
  sched/tune: add initial support for CGroups based boosting
  sched/fair: add boosted CPU usage
  sched/fair: add function to convert boost value into "margin"
  sched/tune: add sysctl interface to define a boost value
  sched/tune: add detailed documentation
  fixup! sched/fair: jump to max OPP when crossing UP threshold
  fixup! sched: scheduler-driven cpu frequency selection
  sched: rt scheduler sets capacity requirement
  sched: deadline: use deadline bandwidth in scale_rt_capacity
  sched: remove call of sched_avg_update from sched_rt_avg_update
  sched/cpufreq_sched: add trace events
  sched/fair: jump to max OPP when crossing UP threshold
  sched/fair: cpufreq_sched triggers for load balancing
  sched/{core,fair}: trigger OPP change request on fork()
  sched/fair: add triggers for OPP change requests
  sched: scheduler-driven cpu frequency selection
  cpufreq: introduce cpufreq_driver_is_slow
  sched: Consider misfit tasks when load-balancing
  sched: Add group_misfit_task load-balance type
  sched: Add per-cpu max capacity to sched_group_capacity
  sched: Do eas idle balance regardless of the rq avg idle value
  arm64: Enable max freq invariant scheduler load-tracking and capacity support
  arm: Enable max freq invariant scheduler load-tracking and capacity support
  sched: Update max cpu capacity in case of max frequency constraints
  cpufreq: Max freq invariant scheduler load-tracking and cpu capacity support
  arm64, topology: Updates to use DT bindings for EAS costing data
  sched: Support for extracting EAS energy costs from DT
  Documentation: DT bindings for energy model cost data required by EAS
  sched: Disable energy-unfriendly nohz kicks
  sched: Consider a not over-utilized energy-aware system as balanced
  sched: Energy-aware wake-up task placement
  sched: Determine the current sched_group idle-state
  sched, cpuidle: Track cpuidle state index in the scheduler
  sched: Add over-utilization/tipping point indicator
  sched: Estimate energy impact of scheduling decisions
  sched: Extend sched_group_energy to test load-balancing decisions
  sched: Calculate energy consumption of sched_group
  sched: Highest energy aware balancing sched_domain level pointer
  sched: Relocated cpu_util() and change return type
  sched: Compute cpu capacity available at current frequency
  arm64: Cpu invariant scheduler load-tracking and capacity support
  arm: Cpu invariant scheduler load-tracking and capacity support
  sched: Introduce SD_SHARE_CAP_STATES sched_domain flag
  sched: Initialize energy data structures
  sched: Introduce energy data structures
  sched: Make energy awareness a sched feature
  sched: Documentation for scheduler energy cost model
  sched: Prevent unnecessary active balance of single task in sched group
  sched: Enable idle balance to pull single task towards cpu with higher capacity
  sched: Consider spare cpu capacity at task wake-up
  sched: Add cpu capacity awareness to wakeup balancing
  sched: Store system-wide maximum cpu capacity in root domain
  arm: Update arch_scale_cpu_capacity() to reflect change to define
  arm64: Enable frequency invariant scheduler load-tracking support
  arm: Enable frequency invariant scheduler load-tracking support
  cpufreq: Frequency invariant scheduler load-tracking support
  sched/fair: Fix new task's load avg removed from source CPU in wake_up_new_task()
  fiq_debugger: Add option to apply uart overlay by FIQ_DEBUGGER_UART_OVERLAY
  Revert "Recreate asm/mach/mmc.h include file"
  Revert "ARM: Add 'card_present' state to mmc_platfrom_data"
  usb: dual-role: make stub functions inline
  Revert "mmc: Add status IRQ and status callback function to mmc platform data"
  quick selinux support for tracefs
  Revert "hid-multitouch: Filter collections by application usage."
  Revert "HID: steelseries: validate output report details"
  xt_qtaguid: Fix panic caused by synack processing
  Revert "mm: vmscan: Add a debug file for shrinkers"
  Revert "SELinux: Enable setting security contexts on rootfs inodes."
  Revert "SELinux: build fix for 4.1"
  fuse: Add support for d_canonical_path
  vfs: change d_canonical_path to take two paths
  android: recommended.cfg: remove CONFIG_UID_STAT
  netfilter: xt_qtaguid: seq_printf fixes
  Revert "misc: uidstat: Adding uid stat driver to collect network statistics."
  Revert "net: activity_stats: Add statistics for network transmission activity"
  Revert "net: activity_stats: Stop using obsolete create_proc_read_entry api"
  Revert "misc: uidstat: avoid create_stat() race and blockage."
  Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api"
  Revert "misc seq_printf fixes for 4.4"
  Revert "misc: uid_stat: Include linux/atomic.h instead of asm/atomic.h"
  Revert "net: socket ioctl to reset connections matching local address"
  Revert "net: fix iterating over hashtable in tcp_nuke_addr()"
  Revert "net: fix crash in tcp_nuke_addr()"
  Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."
  Revert "tcp: Fix IPV6 module build errors"
  android: base-cfg: remove CONFIG_SWITCH
  Revert "switch: switch class and GPIO drivers."
  Revert "drivers: switch: remove S_IWUSR from dev_attr"
  ANDROID: base-cfg: enable CONFIG_IP_NF_NAT
  BACKPORT: selinux: restrict kernel module loading
  android: base-cfg: enable CONFIG_QUOTA
  ANDROID: mmc: Add CONFIG_MMC_SIMULATE_MAX_SPEED
  android: base-cfg: Add CONFIG_INET_DIAG_DESTROY
  cpufreq: interactive: only apply interactive boost when enabled
  cpufreq: interactive: fix policy locking
  ANDROID: dm verity fec: add sysfs attribute fec/corrected
  ANDROID: android: base-cfg: enable CONFIG_DM_VERITY_FEC
  UPSTREAM: dm verity: add ignore_zero_blocks feature
  UPSTREAM: dm verity: add support for forward error correction
  UPSTREAM: dm verity: factor out verity_for_bv_block()
  UPSTREAM: dm verity: factor out structures and functions useful to separate object
  UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c
  UPSTREAM: dm verity: separate function for parsing opt args
  UPSTREAM: dm verity: clean up duplicate hashing code
  UPSTREAM: dm: don't save and restore bi_private
  mm: Export do_munmap
  sdcardfs: remove unneeded __init and __exit
  sdcardfs: Remove unused code
  fs: Export d_absolute_path
  sdcardfs: remove effectless config option
  inotify: Fix erroneous update of bit count
  fs: sdcardfs: Declare LOOKUP_CASE_INSENSITIVE unconditionally
  trace: cpufreq: fix typo in min/max cpufreq
  sdcardfs: Add support for d_canonical_path
  vfs: add d_canonical_path for stacked filesystem support
  sdcardfs: Bring up to date with Android M permissions:
  Changed type-casting in packagelist management
  Port of sdcardfs to 4.4
  Included sdcardfs source code for kernel 3.0
  ANDROID: usb: gadget: Add support for MTP OS desc
  CHROMIUM: usb: gadget: f_accessory: add .raw_request callback
  CHROMIUM: usb: gadget: audio_source: add .free_func callback
  CHROMIUM: usb: gadget: f_mtp: fix usb_ss_ep_comp_descriptor
  CHROMIUM: usb: gadget: f_mtp: Add SuperSpeed support
  FROMLIST: mmc: block: fix ABI regression of mmc_blk_ioctl
  FROMLIST: mm: ASLR: use get_random_long()
  FROMLIST: drivers: char: random: add get_random_long()
  FROMLIST: pstore-ram: fix NULL reference when used with pdata
  usb: u_ether: Add missing rx_work init
  ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue
  Revert "ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue"
  UPSTREAM: ALSA: timer: Harden slave timer list handling
  ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue
  misc: uid_stat: Include linux/atomic.h instead of asm/atomic.h
  hid-sensor-hub.c: fix wrong do_div() usage
  power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled
  UPSTREAM: ARM: 8457/1: psci-smp is built only for SMP
  PM / suspend: Add dependency on RTC_LIB
  drivers: power: use 'current' instead of 'get_current()'
  video: adf: Set ADF_MEMBLOCK to boolean
  video: adf: Fix modular build
  net: ppp: Fix modular build for PPPOLAC and PPPOPNS
  net: pppolac/pppopns: Replace msg.msg_iov with iov_iter_kvec()
  ANDROID: mmc: sdio: Disable retuning in sdio_reset_comm()
  ANDROID: mmc: Move tracepoint creation and export symbols
  ANDROID: kernel/watchdog: fix unused variable warning
  ANDROID: usb: gadget: f_mtp: don't use le16 for u8 field
  ANDROID: lowmemorykiller: fix declaration order warnings
  ANDROID: net: fix 'const' warnings

Change-Id: I5765d6d5577c697c4a8990adb44cfac152f3f787
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

1 files changed, 0 insertions, 2 deletions

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 1de2ef8ec926..f527d8e65d69 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -123,9 +123,7 @@ static unsigned long soft_lockup_nmi_warn;
 #ifdef CONFIG_HARDLOCKUP_DETECTOR
 unsigned int __read_mostly hardlockup_panic =
 			CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;
-#ifdef CONFIG_HARDLOCKUP_DETECTOR_NMI
 static unsigned long __maybe_unused hardlockup_allcpu_dumped;
-#endif
 /*
  * We may not want to enable hard lockup detection by default in all cases,
  * for example when running the kernel as a guest on a hypervisor. In these