Commit 59250f8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "14 patches.

  Subsystems affected by this patch series: MAINTAINERS, binfmt, and
  mm (tmpfs, secretmem, kasan, kfence, pagealloc, zram, compaction,
  hugetlb, vmalloc, and kmemleak)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: kmemleak: take a full lowmem check in kmemleak_*_phys()
  mm/vmalloc: fix spinning drain_vmap_work after reading from /proc/vmcore
  revert "fs/binfmt_elf: use PT_LOAD p_align values for static PIE"
  revert "fs/binfmt_elf: fix PT_LOAD p_align values for loaders"
  hugetlb: do not demote poisoned hugetlb pages
  mm: compaction: fix compiler warning when CONFIG_COMPACTION=n
  mm: fix unexpected zeroed page mapping with zram swap
  mm, page_alloc: fix build_zonerefs_node()
  mm, kfence: support kmem_dump_obj() for KFENCE objects
  kasan: fix hw tags enablement when KUNIT tests are disabled
  irq_work: use kasan_record_aux_stack_noalloc() record callstack
  mm/secretmem: fix panic when growing a memfd_secret
  tmpfs: fix regressions from wider use of ZERO_PAGE
  MAINTAINERS: Broadcom internal lists aren't maintainers
parents ce673f63 23c2d497

MAINTAINERS

+32 −32
Original line number Diff line number Diff line
@@ -3743,7 +3743,7 @@ F: include/linux/platform_data/b53.h 








BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE









M:	Nicolas Saenz Julienne <nsaenz@kernel.org>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained








@@ -3758,7 +3758,7 @@ BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE







M:	Florian Fainelli <f.fainelli@gmail.com>









M:	Ray Jui <rjui@broadcom.com>









M:	Scott Branden <sbranden@broadcom.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









S:	Maintained









T:	git git://github.com/broadcom/mach-bcm









F:	arch/arm/mach-bcm/








@@ -3778,7 +3778,7 @@ F:	arch/mips/include/asm/mach-bcm47xx/*















BROADCOM BCM4908 ETHERNET DRIVER









M:	Rafał Miłecki <rafal@milecki.pl>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml








@@ -3787,7 +3787,7 @@ F:	drivers/net/ethernet/broadcom/unimac.h















BROADCOM BCM4908 PINMUX DRIVER









M:	Rafał Miłecki <rafal@milecki.pl>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-gpio@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml








@@ -3797,7 +3797,7 @@ BROADCOM BCM5301X ARM ARCHITECTURE







M:	Florian Fainelli <f.fainelli@gmail.com>









M:	Hauke Mehrtens <hauke@hauke-m.de>









M:	Rafał Miłecki <zajec5@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	arch/arm/boot/dts/bcm470*








@@ -3808,7 +3808,7 @@ F:	arch/arm/mach-bcm/bcm_5301x.c







BROADCOM BCM53573 ARM ARCHITECTURE









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	Rafał Miłecki <rafal@milecki.pl>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	arch/arm/boot/dts/bcm47189*








@@ -3816,7 +3816,7 @@ F:	arch/arm/boot/dts/bcm53573*















BROADCOM BCM63XX ARM ARCHITECTURE









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://github.com/broadcom/stblinux.git








@@ -3830,7 +3830,7 @@ F:	drivers/usb/gadget/udc/bcm63xx_udc.*















BROADCOM BCM7XXX ARM ARCHITECTURE









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://github.com/broadcom/stblinux.git








@@ -3848,21 +3848,21 @@ N:	bcm7120







BROADCOM BDC DRIVER









M:	Al Cooper <alcooperx@gmail.com>









L:	linux-usb@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









S:	Maintained









F:	Documentation/devicetree/bindings/usb/brcm,bdc.yaml









F:	drivers/usb/gadget/udc/bdc/

















BROADCOM BMIPS CPUFREQ DRIVER









M:	Markus Mayer <mmayer@broadcom.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	drivers/cpufreq/bmips-cpufreq.c

















BROADCOM BMIPS MIPS ARCHITECTURE









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-mips@vger.kernel.org









S:	Maintained









T:	git git://github.com/broadcom/stblinux.git








@@ -3928,53 +3928,53 @@ F:	drivers/net/wireless/broadcom/brcm80211/







BROADCOM BRCMSTB GPIO DRIVER









M:	Doug Berger <opendmb@gmail.com>









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









S:	Supported









F:	Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml









F:	drivers/gpio/gpio-brcmstb.c

















BROADCOM BRCMSTB I2C DRIVER









M:	Kamal Dasu <kdasu.kdev@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-i2c@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Supported









F:	Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml









F:	drivers/i2c/busses/i2c-brcmstb.c

















BROADCOM BRCMSTB UART DRIVER









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-serial@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Maintained









F:	Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml









F:	drivers/tty/serial/8250/8250_bcm7271.c

















BROADCOM BRCMSTB USB EHCI DRIVER









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-usb@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Maintained









F:	Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml









F:	drivers/usb/host/ehci-brcm.*

















BROADCOM BRCMSTB USB PIN MAP DRIVER









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-usb@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Maintained









F:	Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml









F:	drivers/usb/misc/brcmstb-usb-pinmap.c

















BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-kernel@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Maintained









F:	drivers/phy/broadcom/phy-brcm-usb*

















BROADCOM ETHERNET PHY DRIVERS









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt








@@ -3985,7 +3985,7 @@ F:	include/linux/brcmphy.h







BROADCOM GENET ETHERNET DRIVER









M:	Doug Berger <opendmb@gmail.com>









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml








@@ -3999,7 +3999,7 @@ F:	include/linux/platform_data/mdio-bcm-unimac.h







BROADCOM IPROC ARM ARCHITECTURE









M:	Ray Jui <rjui@broadcom.com>









M:	Scott Branden <sbranden@broadcom.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://github.com/broadcom/stblinux.git








@@ -4027,7 +4027,7 @@ N:	stingray















BROADCOM IPROC GBIT ETHERNET DRIVER









M:	Rafał Miłecki <rafal@milecki.pl>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/brcm,amac.yaml








@@ -4036,7 +4036,7 @@ F:	drivers/net/ethernet/broadcom/unimac.h















BROADCOM KONA GPIO DRIVER









M:	Ray Jui <rjui@broadcom.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









S:	Supported









F:	Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt









F:	drivers/gpio/gpio-bcm-kona.c








@@ -4069,7 +4069,7 @@ F:	drivers/firmware/broadcom/*







BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER









M:	Rafał Miłecki <rafal@milecki.pl>









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









T:	git git://github.com/broadcom/stblinux.git








@@ -4085,7 +4085,7 @@ F:	include/linux/bcma/















BROADCOM SPI DRIVER









M:	Kamal Dasu <kdasu.kdev@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









S:	Maintained









F:	Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml









F:	drivers/spi/spi-bcm-qspi.*








@@ -4094,7 +4094,7 @@ F:	drivers/spi/spi-iproc-qspi.c















BROADCOM STB AVS CPUFREQ DRIVER









M:	Markus Mayer <mmayer@broadcom.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt








@@ -4102,7 +4102,7 @@ F:	drivers/cpufreq/brcmstb*















BROADCOM STB AVS TMON DRIVER









M:	Markus Mayer <mmayer@broadcom.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml








@@ -4110,7 +4110,7 @@ F:	drivers/thermal/broadcom/brcmstb*















BROADCOM STB DPFE DRIVER









M:	Markus Mayer <mmayer@broadcom.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml








@@ -4119,8 +4119,8 @@ F:	drivers/memory/brcmstb_dpfe.c







BROADCOM STB NAND FLASH DRIVER









M:	Brian Norris <computersforpeace@gmail.com>









M:	Kamal Dasu <kdasu.kdev@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-mtd@lists.infradead.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Maintained









F:	drivers/mtd/nand/raw/brcmnand/









F:	include/linux/platform_data/brcmnand.h








@@ -4129,7 +4129,7 @@ BROADCOM STB PCIE DRIVER







M:	Jim Quinlan <jim2101024@gmail.com>









M:	Nicolas Saenz Julienne <nsaenz@kernel.org>









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-pci@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml








@@ -4137,7 +4137,7 @@ F:	drivers/pci/controller/pcie-brcmstb.c















BROADCOM SYSTEMPORT ETHERNET DRIVER









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	drivers/net/ethernet/broadcom/bcmsysport.*








@@ -4154,7 +4154,7 @@ F:	drivers/net/ethernet/broadcom/tg3.*















BROADCOM VK DRIVER









M:	Scott Branden <scott.branden@broadcom.com>









L:	bcm-kernel-feedback-list@broadcom.com









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









S:	Supported









F:	drivers/misc/bcm-vk/









F:	include/uapi/linux/misc/bcm_vk.h








@@ -17648,8 +17648,8 @@ K:	\bTIF_SECCOMP\b















SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>









L:	linux-mmc@vger.kernel.org









L:	bcm-kernel-feedback-list@broadcom.com









S:	Maintained









F:	drivers/mmc/host/sdhci-brcmstb*

































arch/x86/include/asm/io.h



+0
−2






























Original line number
Diff line number
Diff line







@@ -210,8 +210,6 @@ void __iomem *ioremap(resource_size_t offset, unsigned long size);







extern void iounmap(volatile void __iomem *addr);









#define iounmap iounmap



















extern void set_iounmap_nonlazy(void);



















#ifdef __KERNEL__



















void memcpy_fromio(void *, const volatile void __iomem *, size_t);
































arch/x86/kernel/crash_dump_64.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -37,7 +37,6 @@ static ssize_t __copy_oldmem_page(unsigned long pfn, char *buf, size_t csize,







	} else









		memcpy(buf, vaddr + offset, csize);



















	set_iounmap_nonlazy();









	iounmap((void __iomem *)vaddr);









	return csize;









}
































fs/binfmt_elf.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -1117,11 +1117,11 @@ static int load_elf_binary(struct linux_binprm *bprm)







			 * independently randomized mmap region (0 load_bias









			 * without MAP_FIXED nor MAP_FIXED_NOREPLACE).









			 */









			alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum);









			if (interpreter || alignment > ELF_MIN_ALIGN) {









			if (interpreter) {









				load_bias = ELF_ET_DYN_BASE;









				if (current->flags & PF_RANDOMIZE)









					load_bias += arch_mmap_rnd();









				alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum);









				if (alignment)









					load_bias &= ~(alignment - 1);









				elf_flags |= MAP_FIXED_NOREPLACE;
































include/linux/kfence.h



+24
−0






























Original line number
Diff line number
Diff line







@@ -204,6 +204,22 @@ static __always_inline __must_check bool kfence_free(void *addr)







 */









bool __must_check kfence_handle_page_fault(unsigned long addr, bool is_write, struct pt_regs *regs);



















#ifdef CONFIG_PRINTK









struct kmem_obj_info;









/**









 * __kfence_obj_info() - fill kmem_obj_info struct









 * @kpp: kmem_obj_info to be filled









 * @object: the object









 *









 * Return:









 * * false - not a KFENCE object









 * * true - a KFENCE object, filled @kpp









 *









 * Copies information to @kpp for KFENCE objects.









 */









bool __kfence_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab);









#endif



















#else /* CONFIG_KFENCE */



















static inline bool is_kfence_address(const void *addr) { return false; }








@@ -221,6 +237,14 @@ static inline bool __must_check kfence_handle_page_fault(unsigned long addr, boo







	return false;









}



















#ifdef CONFIG_PRINTK









struct kmem_obj_info;









static inline bool __kfence_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab)









{









	return false;









}









#endif



















#endif



















#endif /* _LINUX_KFENCE_H */