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

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

Merge 5.4.194 into android11-5.4-lts 



Changes in 5.4.194
	MIPS: Use address-of operator on section symbols
	block: drbd: drbd_nl: Make conversion to 'enum drbd_ret_code' explicit
	drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} types
	drm/i915: Cast remain to unsigned long in eb_relocate_vma
	nfp: bpf: silence bitwise vs. logical OR warning
	can: grcan: grcan_probe(): fix broken system id check for errata workaround needs
	can: grcan: only use the NAPI poll budget for RX
	arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
	KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id()
	x86/asm: Allow to pass macros to __ASM_FORM()
	x86: xen: kvm: Gather the definition of emulate prefixes
	x86: xen: insn: Decode Xen and KVM emulate-prefix signature
	x86: kprobes: Prohibit probing on instruction which has emulate prefix
	KVM: x86/svm: Account for family 17h event renumberings in amd_pmc_perf_hw_id
	Bluetooth: Fix the creation of hdev->name
	mm: fix missing cache flush for all tail pages of compound page
	mm: hugetlb: fix missing cache flush in copy_huge_page_from_user()
	mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic()
	Linux 5.4.194

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib6799ab085043b5cc60cf8e39a22f48dc4520378
parents c336f131 90659487

Documentation/vm/memory-model.rst

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ wrapper :c:func:`free_area_init`. Yet, the mappings array is not 
usable until the call to :c:func:`memblock_free_all` that hands all

the memory to the page allocator.



If an architecture enables `CONFIG_ARCH_HAS_HOLES_MEMORYMODEL` option,

it may free parts of the `mem_map` array that do not cover the

An architecture may free parts of the `mem_map` array that do not cover the

actual physical pages. In such case, the architecture specific

:c:func:`pfn_valid` implementation should take the holes in the

`mem_map` into account.

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 193

SUBLEVEL = 194

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config ARM 
	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_KEEP_MEMBLOCK if HAVE_ARCH_PFN_VALID || KEXEC

	select ARCH_KEEP_MEMBLOCK

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN

	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
@@ -521,7 +521,6 @@ config ARCH_S3C24XX 
config ARCH_OMAP1

	bool "TI OMAP1"

	depends on MMU

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO
@@ -1519,9 +1518,6 @@ config OABI_COMPAT 
	  UNPREDICTABLE (in fact it can be predicted that it won't work

	  at all). If in doubt say N.



config ARCH_HAS_HOLES_MEMORYMODEL

	bool



config ARCH_SPARSEMEM_ENABLE

	bool
@@ -1529,7 +1525,7 @@ config ARCH_SPARSEMEM_DEFAULT 
	def_bool ARCH_SPARSEMEM_ENABLE



config HAVE_ARCH_PFN_VALID

	def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM

	def_bool y



config HIGHMEM

	bool "High Memory Support"

arch/arm/mach-bcm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ config ARCH_BRCMSTB 
	select HAVE_ARM_ARCH_TIMER

	select BRCMSTB_L2_IRQ

	select BCM7120_L2_IRQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ZONE_DMA if ARM_LPAE

	select SOC_BRCMSTB

	select SOC_BUS

arch/arm/mach-davinci/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ menuconfig ARCH_DAVINCI 
	depends on ARCH_MULTI_V5

	select DAVINCI_TIMER

	select ZONE_DMA

	select ARCH_HAS_HOLES_MEMORYMODEL

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	select REGMAP_MMIO