Merge 4.14.11 into android-4.14

Changes in 4.14.11
	tracing: Remove extra zeroing out of the ring buffer page
	tracing: Fix possible double free on failure of allocating trace buffer
	tracing: Fix crash when it fails to alloc ring buffer
	x86/cpufeatures: Add X86_BUG_CPU_INSECURE
	x86/mm/pti: Disable global pages if PAGE_TABLE_ISOLATION=y
	x86/mm/pti: Prepare the x86/entry assembly code for entry/exit CR3 switching
	x86/mm/pti: Add infrastructure for page table isolation
	x86/pti: Add the pti= cmdline option and documentation
	x86/mm/pti: Add mapping helper functions
	x86/mm/pti: Allow NX poison to be set in p4d/pgd
	x86/mm/pti: Allocate a separate user PGD
	x86/mm/pti: Populate user PGD
	x86/mm/pti: Add functions to clone kernel PMDs
	x86/mm/pti: Force entry through trampoline when PTI active
	x86/mm/pti: Share cpu_entry_area with user space page tables
	x86/entry: Align entry text section to PMD boundary
	x86/mm/pti: Share entry text PMD
	x86/mm/pti: Map ESPFIX into user space
	x86/cpu_entry_area: Add debugstore entries to cpu_entry_area
	x86/events/intel/ds: Map debug buffers in cpu_entry_area
	x86/mm/64: Make a full PGD-entry size hole in the memory map
	x86/pti: Put the LDT in its own PGD if PTI is on
	x86/pti: Map the vsyscall page if needed
	x86/mm: Allow flushing for future ASID switches
	x86/mm: Abstract switching CR3
	x86/mm: Use/Fix PCID to optimize user/kernel switches
	x86/mm: Optimize RESTORE_CR3
	x86/mm: Use INVPCID for __native_flush_tlb_single()
	x86/mm: Clarify the whole ASID/kernel PCID/user PCID naming
	x86/dumpstack: Indicate in Oops whether PTI is configured and enabled
	x86/mm/pti: Add Kconfig
	x86/mm/dump_pagetables: Add page table directory to the debugfs VFS hierarchy
	x86/mm/dump_pagetables: Check user space page table for WX pages
	x86/mm/dump_pagetables: Allow dumping current pagetables
	x86/ldt: Make the LDT mapping RO
	ring-buffer: Mask out the info bits when returning buffer page length
	ring-buffer: Do no reuse reader page if still in use
	iw_cxgb4: Only validate the MSN for successful completions
	ASoC: codecs: msm8916-wcd: Fix supported formats
	ASoC: wm_adsp: Fix validation of firmware and coeff lengths
	ASoC: da7218: fix fix child-node lookup
	ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure
	ASoC: twl4030: fix child-node lookup
	ASoC: tlv320aic31xx: Fix GPIO1 register definition
	gpio: fix "gpio-line-names" property retrieval
	IB/hfi: Only read capability registers if the capability exists
	IB/mlx5: Serialize access to the VMA list
	IB/uverbs: Fix command checking as part of ib_uverbs_ex_modify_qp()
	IB/core: Verify that QP is security enabled in create and destroy
	ALSA: hda: Drop useless WARN_ON()
	ALSA: hda - Add MIC_NO_PRESENCE fixup for 2 HP machines
	ALSA: hda - change the location for one mic on a Lenovo machine
	ALSA: hda - fix headset mic detection issue on a Dell machine
	ALSA: hda - Fix missing COEF init for ALC225/295/299
	cpufreq: schedutil: Use idle_calls counter of the remote CPU
	block: fix blk_rq_append_bio
	block: don't let passthrough IO go into .make_request_fn()
	kbuild: add '-fno-stack-check' to kernel build options
	ipv4: igmp: guard against silly MTU values
	ipv6: mcast: better catch silly mtu values
	net: fec: unmap the xmit buffer that are not transferred by DMA
	net: igmp: Use correct source address on IGMPv3 reports
	netlink: Add netns check on taps
	net: qmi_wwan: add Sierra EM7565 1199:9091
	net: reevalulate autoflowlabel setting after sysctl setting
	ptr_ring: add barriers
	RDS: Check cmsg_len before dereferencing CMSG_DATA
	tcp_bbr: record "full bw reached" decision in new full_bw_reached bit
	tcp md5sig: Use skb's saddr when replying to an incoming segment
	tg3: Fix rx hang on MTU change with 5717/5719
	tcp_bbr: reset full pipe detection on loss recovery undo
	tcp_bbr: reset long-term bandwidth sampling on loss recovery undo
	s390/qeth: apply takeover changes when mode is toggled
	s390/qeth: don't apply takeover changes to RXIP
	s390/qeth: lock IP table while applying takeover changes
	s390/qeth: update takeover IPs after configuration change
	net: ipv4: fix for a race condition in raw_sendmsg
	net: mvmdio: disable/unprepare clocks in EPROBE_DEFER case
	sctp: Replace use of sockets_allocated with specified macro.
	adding missing rcu_read_unlock in ipxip6_rcv
	ip6_gre: fix device features for ioctl setup
	ipv4: Fix use-after-free when flushing FIB tables
	net: bridge: fix early call to br_stp_change_bridge_id and plug newlink leaks
	net: Fix double free and memory corruption in get_net_ns_by_id()
	net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround
	sock: free skb in skb_complete_tx_timestamp on error
	tcp: invalidate rate samples during SACK reneging
	net/mlx5: Fix rate limit packet pacing naming and struct
	net/mlx5e: Fix possible deadlock of VXLAN lock
	net/mlx5e: Fix features check of IPv6 traffic
	net/mlx5e: Add refcount to VXLAN structure
	net/mlx5e: Prevent possible races in VXLAN control flow
	net/mlx5: Fix error flow in CREATE_QP command
	openvswitch: Fix pop_vlan action for double tagged frames
	sfc: pass valid pointers from efx_enqueue_unwind
	net: dsa: bcm_sf2: Clear IDDQ_GLOBAL_PWR bit for PHY
	s390/qeth: fix error handling in checksum cmd callback
	sctp: make sure stream nums can match optlen in sctp_setsockopt_reset_streams
	tipc: fix hanging poll() for stream sockets
	mlxsw: spectrum: Disable MAC learning for ovs port
	tcp: fix potential underestimation on rcv_rtt
	net: phy: marvell: Limit 88m1101 autoneg errata to 88E1145 as well.
	ipv6: Honor specified parameters in fibmatch lookup
	tcp: refresh tcp_mstamp from timers callbacks
	net/mlx5: FPGA, return -EINVAL if size is zero
	vxlan: restore dev->mtu setting based on lower device
	net: sched: fix static key imbalance in case of ingress/clsact_init error
	bnxt_en: Fix sources of spurious netpoll warnings
	phylink: ensure the PHY interface mode is appropriately set
	phylink: ensure AN is enabled
	ipv4: fib: Fix metrics match when deleting a route
	ipv6: set all.accept_dad to 0 by default
	Revert "mlx5: move affinity hints assignments to generic code"
	skbuff: orphan frags before zerocopy clone
	skbuff: skb_copy_ubufs must release uarg even without user frags
	skbuff: in skb_copy_ubufs unclone before releasing zerocopy
	sparc64: repair calling incorrect hweight function from stubs
	usbip: fix usbip bind writing random string after command in match_busid
	usbip: prevent leaking socket pointer address in messages
	usbip: stub: stop printing kernel pointer addresses in messages
	usbip: vhci: stop printing kernel pointer addresses in messages
	USB: chipidea: msm: fix ulpi-node lookup
	USB: serial: ftdi_sio: add id for Airbus DS P8GR
	USB: serial: qcserial: add Sierra Wireless EM7565
	USB: serial: option: add support for Telit ME910 PID 0x1101
	USB: serial: option: adding support for YUGA CLM920-NC5
	usb: Add device quirk for Logitech HD Pro Webcam C925e
	usb: add RESET_RESUME for ELSA MicroLink 56K
	USB: Fix off by one in type-specific length check of BOS SSP capability
	usb: xhci: Add XHCI_TRUST_TX_LENGTH for Renesas uPD720201
	timers: Use deferrable base independent of base::nohz_active
	timers: Invoke timer_start_debug() where it makes sense
	timers: Reinitialize per cpu bases on hotplug
	binder: fix proc->files use-after-free
	phy: tegra: fix device-tree node lookups
	drivers: base: cacheinfo: fix cache type for non-architected system cache
	staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device
	nohz: Prevent a timer interrupt storm in tick_nohz_stop_sched_tick()
	x86/smpboot: Remove stale TLB flush invocations
	x86/mm: Remove preempt_disable/enable() from __native_flush_tlb()
	x86-32: Fix kexec with stack canary (CONFIG_CC_STACKPROTECTOR)
	x86/espfix/64: Fix espfix double-fault handling on 5-level systems
	x86/ldt: Plug memory leak in error path
	x86/ldt: Make LDT pgtable free conditional
	n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)
	tty: fix tty_ldisc_receive_buf() documentation
	Linux 4.14.11

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/init/main.c b/init/main.c
index 8a390f60ec81..b32ec72cdf3d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -75,6 +75,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <linux/ptrace.h>
+#include <linux/pti.h>
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/sched_clock.h>
@@ -506,6 +507,8 @@ static void __init mm_init(void)
 	ioremap_huge_init();
 	/* Should be run before the first non-init thread is created */
 	init_espfix_bsp();
+	/* Should be run after espfix64 is set up. */
+	pti_init();
 }
 
 asmlinkage __visible void __init start_kernel(void)