The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/34b52a84be020b68e92de215ef7ce9af1fd8efae

commit 34b52a84be020b68e92de215ef7ce9af1fd8efae
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Jan 23 20:04:35 2018

CHROMIUM: Merge 'v4.4.113' into chromeos-4.4

Merge of v4.4.113 into chromeos-4.4

Conflicts:
    arch/x86/entry/entry_64.S

Changelog:
----------------------------------------------------------------
Adam Borowski (1):
      x86/kbuild: enable modversions for symbols exported from asm

Al Viro (1):
      EXPORT_SYMBOL() for asm

Andi Kleen (3):
      x86/retpoline/irq32: Convert assembler indirect jumps
      module: Add retpoline tag to VERMAGIC
      x86/retpoline: Optimize inline assembler for vmexit_fill_RSB

Andrey Ryabinin (1):
      x86/asm: Use register variable to get stack pointer value

Andy Lutomirski (2):
      x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier
      x86/asm: Make asm/alternative.h safe from assembly

Arnd Bergmann (2):
      gcov: disable for COMPILE_TEST
      phy: work around 'phys' references to usb-nop-xceiv devices

David Woodhouse (9):
      x86/retpoline: Add initial retpoline support
      x86/spectre: Add boot time option to select Spectre v2 mitigation
      x86/retpoline/crypto: Convert crypto assembler indirect jumps
      x86/retpoline/entry: Convert entry assembler indirect jumps
      x86/retpoline/ftrace: Convert ftrace assembler indirect jumps
      x86/retpoline/hyperv: Convert assembler indirect jumps
      x86/retpoline/xen: Convert Xen hypercall indirect jumps
      x86/retpoline/checksum32: Convert assembler indirect jumps
      x86/retpoline: Fill return stack buffer on vmexit

Dennis Yang (1):
      dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6

Eric Biggers (2):
      af_key: fix buffer overread in verify_address_len()
      af_key: fix buffer overread in parse_exthdrs()

Greg Kroah-Hartman (1):
      Linux 4.4.113

Guenter Roeck (1):
      Merge remote-tracking branch 'origin/linux/v4.4.113' into merge/chromeos-4.4-v4.4.113

H. Nikolaus Schaller (1):
      Input: twl6040-vibra - fix DT node memory management

Hannes Reinecke (1):
      scsi: sg: disable SET_FORCE_LOW_DMA

Joe Lawrence (1):
      pipe: avoid round_pipe_size() nr_pages overflow on 32-bit

Joe Thornber (1):
      dm btree: fix serious bug in btree_split_beneath()

Johan Hovold (3):
      Input: 88pm860x-ts - fix child-node lookup
      Input: twl6040-vibra - fix child-node lookup
      Input: twl4030-vibra - fix sibling-node lookup

Jonas Gorski (1):
      MIPS: AR7: ensure the port type's FCR value is used

Li Jinyue (1):
      futex: Prevent overflow by strengthen input validation

Marc Zyngier (1):
      arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls

Masahiro Yamada (1):
      kconfig.h: use __is_defined() to check if MODULE is defined

Masami Hiramatsu (3):
      retpoline: Introduce start/end markers of indirect thunk
      kprobes/x86: Blacklist indirect thunk functions for kprobes
      kprobes/x86: Disable optimizing on the function jumps to indirect thunk

Nicholas Piggin (1):
      kbuild: modversions for EXPORT_SYMBOL() for asm

Stephane Grosjean (1):
      can: peak: fix potential bug in packet fragmentation

Steven Rostedt (VMware) (1):
      tracing: Fix converting enum's from the map in trace_event_eval_update()

Takashi Iwai (3):
      ALSA: pcm: Remove yet superfluous WARN_ON()
      ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant
      ALSA: hda - Apply the existing quirk to iMac 14,1

Thomas Gleixner (3):
      x86/retpoline: Remove compile time warning
      x86/apic/vector: Fix off by one in error path
      x86/mce: Make machine check speculation protected

Thomas Petazzoni (1):
      ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7

Tom Lendacky (4):
      x86/cpu/AMD: Make LFENCE a serializing instruction
      x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC
      x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
      x86/cpu, x86/pti: Do not enable PTI on AMD processors

Tomas Henzl (1):
      scsi: hpsa: fix volume offline state

Xinyu Lin (1):
      libata: apply MAX_SEC_1024 to all LITEON EP1 series devices

Xunlei Pang (1):
      sched/deadline: Zero out positive runtime after throttling constrained tasks

zhenwei.pi (1):
      x86/pti: Document fix wrong index

 Documentation/kernel-parameters.txt          |  28 ++++
 Documentation/x86/pti.txt                    |   2 +-
 Makefile                                     |   2 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts |  10 +-
 arch/arm64/kvm/handle_exit.c                 |   4 +-
 arch/mips/ar7/platform.c                     |   2 +-
 arch/x86/Kconfig                             |  13 ++
 arch/x86/Makefile                            |   8 ++
 arch/x86/crypto/aesni-intel_asm.S            |   5 +-
 arch/x86/crypto/camellia-aesni-avx-asm_64.S  |   3 +-
 arch/x86/crypto/camellia-aesni-avx2-asm_64.S |   3 +-
 arch/x86/crypto/crc32c-pcl-intel-asm_64.S    |   3 +-
 arch/x86/entry/entry_32.S                    |  11 +-
 arch/x86/entry/entry_64.S                    |  26 +++-
 arch/x86/include/asm/alternative.h           |   4 +
 arch/x86/include/asm/asm-prototypes.h        |  41 ++++++
 arch/x86/include/asm/asm.h                   |  11 ++
 arch/x86/include/asm/cpufeature.h            |   2 +
 arch/x86/include/asm/msr-index.h             |   3 +
 arch/x86/include/asm/nospec-branch.h         | 198 +++++++++++++++++++++++++++
 arch/x86/include/asm/thread_info.h           |  11 --
 arch/x86/include/asm/traps.h                 |   1 +
 arch/x86/include/asm/xen/hypercall.h         |   5 +-
 arch/x86/kernel/apic/vector.c                |   7 +-
 arch/x86/kernel/cpu/amd.c                    |  28 +++-
 arch/x86/kernel/cpu/bugs.c                   | 166 ++++++++++++++++++++--
 arch/x86/kernel/cpu/common.c                 |  12 +-
 arch/x86/kernel/cpu/mcheck/mce.c             |   5 +
 arch/x86/kernel/irq_32.c                     |  15 +-
 arch/x86/kernel/kprobes/opt.c                |  23 +++-
 arch/x86/kernel/mcount_64.S                  |   7 +-
 arch/x86/kernel/traps.c                      |   2 +-
 arch/x86/kernel/vmlinux.lds.S                |   7 +
 arch/x86/kvm/svm.c                           |   4 +
 arch/x86/kvm/vmx.c                           |   4 +
 arch/x86/lib/Makefile                        |   1 +
 arch/x86/lib/checksum_32.S                   |   7 +-
 arch/x86/lib/retpoline.S                     |  49 +++++++
 drivers/ata/libata-core.c                    |   1 +
 drivers/hv/hv.c                              |  11 +-
 drivers/input/misc/twl4030-vibra.c           |   6 +-
 drivers/input/misc/twl6040-vibra.c           |   2 +-
 drivers/input/touchscreen/88pm860x-ts.c      |  16 ++-
 drivers/md/dm-thin-metadata.c                |   6 +-
 drivers/md/persistent-data/dm-btree.c        |  19 +--
 drivers/net/can/usb/peak_usb/pcan_usb_fd.c   |  21 +--
 drivers/phy/phy-core.c                       |   4 +
 drivers/scsi/hpsa.c                          |   1 +
 drivers/scsi/sg.c                            |  30 ++--
 fs/pipe.c                                    |  18 ++-
 include/asm-generic/asm-prototypes.h         |   7 +
 include/asm-generic/export.h                 |  94 +++++++++++++
 include/linux/kconfig.h                      |  11 +-
 include/linux/vermagic.h                     |   8 +-
 include/scsi/sg.h                            |   1 -
 kernel/futex.c                               |   3 +
 kernel/gcov/Kconfig                          |   1 +
 kernel/sched/deadline.c                      |   2 +
 kernel/trace/trace_events.c                  |  16 ++-
 net/key/af_key.c                             |   8 ++
 scripts/Makefile.build                       |  87 +++++++++++-
 sound/core/pcm_lib.c                         |   1 -
 sound/pci/hda/patch_cirrus.c                 |   1 +
 sound/pci/hda/patch_realtek.c                |   1 +
 64 files changed, 970 insertions(+), 139 deletions(-)
 create mode 100644 arch/x86/include/asm/asm-prototypes.h
 create mode 100644 arch/x86/include/asm/nospec-branch.h
 create mode 100644 arch/x86/lib/retpoline.S
 create mode 100644 include/asm-generic/asm-prototypes.h
 create mode 100644 include/asm-generic/export.h

BUG= chromium:804999 
TEST=Build and test on various affected systems

Change-Id: I4b44a3f713b6c52bba7320ec003cea2c31b1c5f0
Signed-off-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/34b52a84be020b68e92de215ef7ce9af1fd8efae/arch/x86/entry/entry_64.S