Merge tag 'LA.UM.8.4.r1-05700-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998

* tag 'LA.UM.8.4.r1-05700-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
  msm: adsprpc: Fix array index underflow problem
  profiler: Fix compilation errors
  fbdev: msm: fix ret value while translating to mdp format
  clk: msm: Fix compilation errors with clang
  ath10k: Fix compilation issue
  drm/msm/sde: Fix clang compilation in SDE driver
  ais: cam_soc_api: Fix compilation error
  msm: camera: reset atomic variable
  msm: v4l2loopback: Fix clang compilation error
  msm: Fix compilation error
  asoc: msm-8998: Add new FE's for TDM Primary
  diag: dci: Synchronize dci mempool buffers alloc and free
  headers_lib: rename Android.bp
  kbuild: skip install/check of headers right under uapi directories
  uapi: export all arch specifics directories
  kernel_headers: Fix headers not detected in incremental builds
  kernel headers: Update comparison logic
  Kbuild : Use no-export-headers to avoid exporting headers
  kernel_headers: kernel headers library package
  kbuild: replace genhdr-y with generated-y
  uapi: export all headers under uapi directories
  uapi: sound: move necessary sound headers under uapi
  kernel: Fix build errors with LLVM
  Revert "ARM: dts: msm: Remove cpu max frequency restriction on cold temp for msm8996."
  ARM: dts: msm: Remove cpu max frequency restriction on cold temp for msm8996.
  input: touchpanel: Fix compilation errors with clang
  asoc: msm-8998: TDM device grouping changes for capture path
  kbuild, x86: Track generated headers with generated-y
  kbuild: Remove stale asm-generic wrappers
  ARM: put types.h in uapi
  msm: ais: jpegdma: Fix uninitialized variable
  Makefile.headersinst: remove destination-y option
  msm: adsprpc: DSP device node to provide restricted access to ADSP/SLPI

Conflicts:
	.gitignore
	drivers/mmc/core/sdio_cis.c

Change-Id: I70cf2a0fbcfcbc834a21cf7fa8db9bd2e1c755b1

2 files changed, 9 insertions, 61 deletions

diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index aeac434c9feb..2cfed174e3c9 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -1,5 +1,11 @@
 
 
+generated-y += syscalls_32.h
+generated-y += syscalls_64.h
+generated-y += unistd_32_ia32.h
+generated-y += unistd_64_x32.h
+generated-y += xen-hypercalls.h
+
 genhdr-y += unistd_32.h
 genhdr-y += unistd_64.h
 genhdr-y += unistd_x32.h
diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild
index 1c532b3f18ea..da1489cb64dc 100644
--- a/arch/x86/include/uapi/asm/Kbuild
+++ b/arch/x86/include/uapi/asm/Kbuild
@@ -1,64 +1,6 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
-genhdr-y += unistd_32.h
-genhdr-y += unistd_64.h
-genhdr-y += unistd_x32.h
-header-y += a.out.h
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += boot.h
-header-y += bootparam.h
-header-y += byteorder.h
-header-y += debugreg.h
-header-y += e820.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += hw_breakpoint.h
-header-y += hyperv.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += ist.h
-header-y += kvm.h
-header-y += kvm_para.h
-header-y += kvm_perf.h
-header-y += ldt.h
-header-y += mce.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += msr.h
-header-y += mtrr.h
-header-y += param.h
-header-y += perf_regs.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += posix_types_32.h
-header-y += posix_types_64.h
-header-y += posix_types_x32.h
-header-y += prctl.h
-header-y += processor-flags.h
-header-y += ptrace-abi.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += sigcontext32.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += svm.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += ucontext.h
-header-y += unistd.h
-header-y += vm86.h
-header-y += vmx.h
-header-y += vsyscall.h
+generated-y += unistd_32.h
+generated-y += unistd_64.h
+generated-y += unistd_x32.h