Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2815aad9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.145 into android-4.14-q 



Changes in 4.14.145
	bridge/mdb: remove wrong use of NLM_F_MULTI
	cdc_ether: fix rndis support for Mediatek based smartphones
	ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()'
	isdn/capi: check message length in capi_write()
	net: Fix null de-reference of device refcount
	net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list
	net: phylink: Fix flow control resolution
	sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero
	sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()'
	sctp: use transport pf_retrans in sctp_do_8_2_transport_strike
	tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR
	tipc: add NULL pointer check before calling kfree_rcu
	tun: fix use-after-free when register netdev failed
	btrfs: compression: add helper for type to string conversion
	btrfs: correctly validate compression type
	Revert "MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur"
	gpiolib: acpi: Add gpiolib_acpi_run_edge_events_on_boot option and blacklist
	gpio: fix line flag validation in linehandle_create
	gpio: fix line flag validation in lineevent_create
	Btrfs: fix assertion failure during fsync and use of stale transaction
	genirq: Prevent NULL pointer dereference in resend_irqs()
	KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl
	KVM: x86: work around leak of uninitialized stack contents
	KVM: nVMX: handle page fault in vmread
	MIPS: VDSO: Prevent use of smp_processor_id()
	MIPS: VDSO: Use same -m%-float cflag as the kernel proper
	powerpc: Add barrier_nospec to raw_copy_in_user()
	drm/meson: Add support for XBGR8888 & ABGR8888 formats
	clk: rockchip: Don't yell about bad mmc phases when getting
	mtd: rawnand: mtk: Fix wrongly assigned OOB buffer pointer issue
	PCI: Always allow probing with driver_override
	ubifs: Correctly use tnc_next() in search_dh_cookie()
	driver core: Fix use-after-free and double free on glue directory
	crypto: talitos - check AES key size
	crypto: talitos - fix CTR alg blocksize
	crypto: talitos - check data blocksize in ablkcipher.
	crypto: talitos - fix ECB algs ivsize
	crypto: talitos - Do not modify req->cryptlen on decryption.
	crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking.
	firmware: ti_sci: Always request response from firmware
	drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto
	Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature"
	platform/x86: pmc_atom: Add CB4063 Beckhoff Automation board to critclk_systems DMI table
	nvmem: Use the same permissions for eeprom as for nvmem
	x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning
	Linux 4.14.145

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents aee6850a b10ab5e2

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 144

SUBLEVEL = 145

EXTRAVERSION =

NAME = Petit Gorille

arch/mips/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -800,7 +800,6 @@ config SIBYTE_SWARM 
	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ZONE_DMA32 if 64BIT

	select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI



config SIBYTE_LITTLESUR

	bool "Sibyte BCM91250C2-LittleSur"
@@ -823,7 +822,6 @@ config SIBYTE_SENTOSA 
	select SYS_HAS_CPU_SB1

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI



config SIBYTE_BIGSUR

	bool "Sibyte BCM91480B-BigSur"
@@ -837,7 +835,6 @@ config SIBYTE_BIGSUR 
	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ZONE_DMA32 if 64BIT

	select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI



config SNI_RM

	bool "SNI RM200/300/400"

arch/mips/include/asm/smp.h

+11 −1
Original line number Diff line number Diff line
@@ -25,7 +25,17 @@ extern cpumask_t cpu_sibling_map[]; 
extern cpumask_t cpu_core_map[];

extern cpumask_t cpu_foreign_map[];



#define raw_smp_processor_id() (current_thread_info()->cpu)

static inline int raw_smp_processor_id(void)

{

#if defined(__VDSO__)

	extern int vdso_smp_processor_id(void)

		__compiletime_error("VDSO should not call smp_processor_id()");

	return vdso_smp_processor_id();

#else

	return current_thread_info()->cpu;

#endif

}

#define raw_smp_processor_id raw_smp_processor_id



/* Map from cpu id to sequential logical cpu number.  This will only

   not be idempotent when cpus failed to come on-line.	*/

arch/mips/sibyte/common/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y := cfe.o

obj-$(CONFIG_SWIOTLB)			+= dma.o

obj-$(CONFIG_SIBYTE_BUS_WATCHER)	+= bus_watcher.o

obj-$(CONFIG_SIBYTE_CFE_CONSOLE)	+= cfe_console.o

obj-$(CONFIG_SIBYTE_TBPROF)		+= sb_tbprof.o

arch/mips/sibyte/common/dma.c

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 *	DMA support for Broadcom SiByte platforms.

 *

 *	Copyright (c) 2018  Maciej W. Rozycki

 */



#include <linux/swiotlb.h>

#include <asm/bootinfo.h>



void __init plat_swiotlb_setup(void)

{

	swiotlb_init(1);

}