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

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

Merge 4.14.48 into android-4.14 



Changes in 4.14.48
	fix io_destroy()/aio_complete() race
	mm: fix the NULL mapping case in __isolate_lru_page()
	objtool: Support GCC 8's cold subfunctions
	objtool: Support GCC 8 switch tables
	objtool: Detect RIP-relative switch table references
	objtool: Detect RIP-relative switch table references, part 2
	objtool: Fix "noreturn" detection for recursive sibling calls
	x86/mce/AMD: Carve out SMCA get_block_address() code
	x86/MCE/AMD: Cache SMCA MISC block addresses
	Revert "pinctrl: msm: Use dynamic GPIO numbering"
	PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()
	xfs: convert XFS_AGFL_SIZE to a helper function
	xfs: detect agfl count corruption and reset agfl
	Input: synaptics - Lenovo Carbon X1 Gen5 (2017) devices should use RMI
	Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints should use RMI
	Input: synaptics - add Intertouch support on X1 Carbon 6th and X280
	Input: synaptics - add Lenovo 80 series ids to SMBus
	Input: elan_i2c_smbus - fix corrupted stack
	tracing: Fix crash when freeing instances with event triggers
	tracing: Make the snapshot trigger work with instances
	selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
	cfg80211: further limit wiphy names to 64 bytes
	kbuild: clang: remove crufty HOSTCFLAGS
	drm/i915: Always sanity check engine state upon idling
	dma-buf: remove redundant initialization of sg_table
	drm/amd/powerplay: Fix enum mismatch
	rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c
	ASoC: Intel: sst: remove redundant variable dma_dev_name
	platform/chrome: cros_ec_lpc: remove redundant pointer request
	kbuild: clang: disable unused variable warnings only when constant
	tcp: avoid integer overflows in tcp_rcv_space_adjust()
	iio: ad7793: implement IIO_CHAN_INFO_SAMP_FREQ
	iio:buffer: make length types match kfifo types
	iio:kfifo_buf: check for uint overflow
	iio: adc: select buffer for at91-sama5d2_adc
	MIPS: lantiq: gphy: Drop reboot/remove reset asserts
	MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs
	MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests
	scsi: scsi_transport_srp: Fix shost to rport translation
	stm class: Use vmalloc for the master map
	hwtracing: stm: fix build error on some arches
	IB/core: Fix error code for invalid GID entry
	mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty()
	Revert "rt2800: use TXOP_BACKOFF for probe frames"
	intel_th: Use correct device when freeing buffers
	drm/psr: Fix missed entry in PSR setup time table.
	drm/i915/lvds: Move acpi lid notification registration to registration phase
	drm/i915: Disable LVDS on Radiant P845
	powerpc/mm/slice: Remove intermediate bitmap copy
	powerpc/mm/slice: create header files dedicated to slices
	powerpc/mm/slice: Enhance for supporting PPC32
	powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx
	Linux 4.14.48

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 019b711f 2c6025eb

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 47

SUBLEVEL = 48

EXTRAVERSION =

NAME = Petit Gorille
@@ -369,11 +369,6 @@ HOSTCXXFLAGS := -O2 $(HOST_LFS_CFLAGS) 
HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS)

HOST_LOADLIBES := $(HOST_LFS_LIBS)



ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)

HOSTCFLAGS  += -Wno-unused-value -Wno-unused-parameter \

		-Wno-missing-field-initializers -fno-delete-null-pointer-checks

endif



# Make variables (CC, etc...)

AS		= $(CROSS_COMPILE)as

LD		= $(CROSS_COMPILE)ld
@@ -727,7 +722,6 @@ KBUILD_CFLAGS += $(stackp-flag) 


ifeq ($(cc-name),clang)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
@@ -746,9 +740,9 @@ else 
# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

endif



KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

else

arch/mips/kernel/process.c

+4 −0
Original line number Diff line number Diff line
@@ -721,6 +721,10 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) 
	if (value & ~known_bits)

		return -EOPNOTSUPP;



	/* Setting FRE without FR is not supported.  */

	if ((value & (PR_FP_MODE_FR | PR_FP_MODE_FRE)) == PR_FP_MODE_FRE)

		return -EOPNOTSUPP;



	/* Avoid inadvertently triggering emulation */

	if ((value & PR_FP_MODE_FR) && raw_cpu_has_fpu &&

	    !(raw_current_cpu_data.fpu_id & MIPS_FPIR_F64))

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ long arch_ptrace(struct task_struct *child, long request, 
				break;

			}

#endif

			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);

			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);

			break;

		case PC:

			tmp = regs->cp0_epc;

arch/mips/kernel/ptrace32.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
						addr & 1);

				break;

			}

			tmp = get_fpr32(&fregs[addr - FPR_BASE], 0);

			tmp = get_fpr64(&fregs[addr - FPR_BASE], 0);

			break;

		case PC:

			tmp = regs->cp0_epc;

arch/powerpc/include/asm/book3s/64/slice.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H

#define _ASM_POWERPC_BOOK3S_64_SLICE_H



#ifdef CONFIG_PPC_MM_SLICES



#define SLICE_LOW_SHIFT		28

#define SLICE_LOW_TOP		(0x100000000ul)

#define SLICE_NUM_LOW		(SLICE_LOW_TOP >> SLICE_LOW_SHIFT)

#define GET_LOW_SLICE_INDEX(addr)	((addr) >> SLICE_LOW_SHIFT)



#define SLICE_HIGH_SHIFT	40

#define SLICE_NUM_HIGH		(H_PGTABLE_RANGE >> SLICE_HIGH_SHIFT)

#define GET_HIGH_SLICE_INDEX(addr)	((addr) >> SLICE_HIGH_SHIFT)



#else /* CONFIG_PPC_MM_SLICES */



#define get_slice_psize(mm, addr)	((mm)->context.user_psize)

#define slice_set_user_psize(mm, psize)		\

do {						\

	(mm)->context.user_psize = (psize);	\

	(mm)->context.sllp = SLB_VSID_USER | mmu_psize_defs[(psize)].sllp; \

} while (0)



#endif /* CONFIG_PPC_MM_SLICES */



#endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */