From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 10 Jan 2017 07:57:54 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux... 
X-Git-Tag: firefly_0821_release~781
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=7b2f394bb8ae3881aed47728d8d74a9e094badd8

Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

* linux-linaro-lsk-v4.4-android: (199 commits)
  Linux 4.4.41
  net: mvpp2: fix dma unmapping of TX buffers for fragments
  sg_write()/bsg_write() is not fit to be called under KERNEL_DS
  kconfig/nconf: Fix hang when editing symbol with a long prompt
  target/user: Fix use-after-free of tcmu_cmds if they are expired
  powerpc: Convert cmp to cmpd in idle enter sequence
  powerpc/ps3: Fix system hang with GCC 5 builds
  nfs_write_end(): fix handling of short copies
  libceph: verify authorize reply on connect
  PCI: Check for PME in targeted sleep state
  Input: drv260x - fix input device's parent assignment
  media: solo6x10: fix lockup by avoiding delayed register write
  IB/cma: Fix a race condition in iboe_addr_get_sgid()
  IB/multicast: Check ib_find_pkey() return value
  IPoIB: Avoid reading an uninitialized member variable
  IB/mad: Fix an array index check
  fgraph: Handle a case where a tracer ignores set_graph_notrace
  platform/x86: asus-nb-wmi.c: Add X45U quirk
  ftrace/x86_32: Set ftrace_stub to weak to prevent gcc from using short jumps to it
  kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)
  ...

Change-Id: I8c8467700d5563d9a1121c982737ff0ab6d9cdc9
---

7b2f394bb8ae3881aed47728d8d74a9e094badd8
diff --cc arch/arm64/mm/fault.c
index 7e4423d22d28,380e02941691..25547993a5ea
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@@ -673,8 -683,8 +683,9 @@@ int cpu_enable_pan(void *__unused
   * We need to enable the feature at runtime (instead of adding it to
   * PSR_MODE_EL1h) as the feature may not be implemented by the cpu.
   */
- void cpu_enable_uao(void *__unused)
+ int cpu_enable_uao(void *__unused)
  {
  	asm(SET_PSTATE_UAO(1));
++	return 0;
  }
  #endif /* CONFIG_ARM64_UAO */