Linux 4.19.293

I'm announcing the release of the 4.19.293 kernel.

All users of the 4.19 kernel series must upgrade.

The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                                                     |    2 
 arch/mips/include/asm/cpu-features.h                         |   21 
 arch/mips/include/asm/dec/prom.h                             |    2 
 arch/powerpc/Kconfig                                         |    1 
 arch/powerpc/Kconfig.debug                                   |    4 
 arch/powerpc/Makefile                                        |   24 
 arch/powerpc/include/asm/book3s/32/mmu-hash.h                |    6 
 arch/powerpc/include/asm/book3s/64/mmu.h                     |    9 
 arch/powerpc/include/asm/mmu-40x.h                           |   68 
 arch/powerpc/include/asm/mmu-44x.h                           |  153 -
 arch/powerpc/include/asm/mmu-8xx.h                           |  244 --
 arch/powerpc/include/asm/mmu-book3e.h                        |  313 ---
 arch/powerpc/include/asm/mmu.h                               |   14 
 arch/powerpc/include/asm/nohash/32/mmu-40x.h                 |   68 
 arch/powerpc/include/asm/nohash/32/mmu-44x.h                 |  153 +
 arch/powerpc/include/asm/nohash/32/mmu-8xx.h                 |  244 ++
 arch/powerpc/include/asm/nohash/32/mmu.h                     |   23 
 arch/powerpc/include/asm/nohash/64/mmu.h                     |   12 
 arch/powerpc/include/asm/nohash/mmu-book3e.h                 |  313 +++
 arch/powerpc/include/asm/nohash/mmu.h                        |   11 
 arch/powerpc/include/asm/page.h                              |   14 
 arch/powerpc/include/asm/stackprotector.h                    |   34 
 arch/powerpc/kernel/Makefile                                 |    2 
 arch/powerpc/kernel/asm-offsets.c                            |    3 
 arch/powerpc/kernel/cpu_setup_fsl_booke.S                    |    2 
 arch/powerpc/kernel/rtas_flash.c                             |    6 
 arch/powerpc/kvm/e500.h                                      |    2 
 arch/powerpc/mm/Makefile                                     |   10 
 arch/powerpc/mm/dump_hashpagetable.c                         |  550 ------
 arch/powerpc/mm/dump_linuxpagetables-8xx.c                   |   82 
 arch/powerpc/mm/dump_linuxpagetables-book3s64.c              |  115 -
 arch/powerpc/mm/dump_linuxpagetables-generic.c               |   82 
 arch/powerpc/mm/dump_linuxpagetables.c                       |  373 ----
 arch/powerpc/mm/dump_linuxpagetables.h                       |   19 
 arch/powerpc/mm/pgtable-radix.c                              |    4 
 arch/powerpc/mm/ptdump/8xx.c                                 |   82 
 arch/powerpc/mm/ptdump/Makefile                              |    9 
 arch/powerpc/mm/ptdump/bats.c                                |  173 +
 arch/powerpc/mm/ptdump/book3s64.c                            |  115 +
 arch/powerpc/mm/ptdump/hashpagetable.c                       |  550 ++++++
 arch/powerpc/mm/ptdump/ptdump.c                              |  373 ++++
 arch/powerpc/mm/ptdump/ptdump.h                              |   19 
 arch/powerpc/mm/ptdump/segment_regs.c                        |   64 
 arch/powerpc/mm/ptdump/shared.c                              |   82 
 arch/powerpc/platforms/powermac/Makefile                     |    1 
 arch/x86/kernel/cpu/topology.c                               |    5 
 arch/x86/kernel/fpu/xstate.c                                 |    8 
 block/partitions/amiga.c                                     |    9 
 drivers/base/regmap/regmap-i2c.c                             |    4 
 drivers/dma-buf/sw_sync.c                                    |   18 
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c                       |    6 
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c    |    4 
 drivers/gpu/drm/radeon/radeon_cs.c                           |    3 
 drivers/hid/hid-ids.h                                        |    1 
 drivers/hid/hid-quirks.c                                     |    1 
 drivers/iio/Kconfig                                          |    1 
 drivers/iio/Makefile                                         |    1 
 drivers/iio/adc/stx104.c                                     |   96 -
 drivers/iio/addac/Kconfig                                    |    8 
 drivers/iio/addac/Makefile                                   |    6 
 drivers/irqchip/irq-mips-gic.c                               |   65 
 drivers/md/dm-integrity.c                                    |    4 
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c           |    2 
 drivers/media/platform/mtk-vpu/mtk_vpu.c                     |    6 
 drivers/mmc/core/block.c                                     |   11 
 drivers/mmc/host/bcm2835.c                                   |    5 
 drivers/mmc/host/jz4740_mmc.c                                |    1 
 drivers/mmc/host/meson-gx-mmc.c                              |   18 
 drivers/mmc/host/mxcmmc.c                                    |    4 
 drivers/mmc/host/renesas_sdhi_core.c                         |   62 
 drivers/mmc/host/s3cmci.c                                    |    1 
 drivers/mmc/host/sdhci-msm.c                                 |    2 
 drivers/mmc/host/sdhci-pltfm.c                               |    1 
 drivers/mmc/host/sdhci-s3c.c                                 |    4 
 drivers/mmc/host/sdhci_f_sdh30.c                             |    4 
 drivers/mmc/host/sunxi-mmc.c                                 |    4 
 drivers/mmc/host/tmio_mmc.c                                  |   48 
 drivers/mmc/host/tmio_mmc.h                                  |    4 
 drivers/mmc/host/tmio_mmc_core.c                             |   92 -
 drivers/mmc/host/wbsd.c                                      |    2 
 drivers/net/bonding/bond_alb.c                               |    6 
 drivers/net/ethernet/ibm/ibmveth.c                           |    2 
 drivers/net/ethernet/intel/i40e/i40e_nvm.c                   |   16 
 drivers/net/ethernet/intel/igb/igb_ptp.c                     |   24 
 drivers/net/phy/broadcom.c                                   |   13 
 drivers/net/team/team.c                                      |    4 
 drivers/net/virtio_net.c                                     |    4 
 drivers/pci/hotplug/acpiphp_glue.c                           |    9 
 drivers/pcmcia/rsrc_nonstatic.c                              |    2 
 drivers/scsi/raid_class.c                                    |   48 
 drivers/scsi/snic/snic_disc.c                                |    3 
 drivers/tty/serial/8250/8250_port.c                          |    1 
 drivers/tty/serial/fsl_lpuart.c                              |    2 
 drivers/usb/dwc3/dwc3-qcom.c                                 |   69 
 drivers/video/fbdev/core/sysimgblt.c                         |   64 
 drivers/video/fbdev/mmp/hw/mmp_ctrl.c                        |    4 
 drivers/virtio/virtio_mmio.c                                 |   23 
 fs/btrfs/volumes.c                                           |    3 
 fs/cifs/file.c                                               |    2 
 fs/dlm/lock.c                                                |   53 
 fs/dlm/plock.c                                               |   89 
 fs/dlm/recover.c                                             |   39 
 fs/gfs2/super.c                                              |   26 
 fs/jfs/jfs_dmap.c                                            |    3 
 fs/jfs/jfs_txnmgr.c                                          |    5 
 fs/jfs/namei.c                                               |    5 
 fs/nfsd/nfs4state.c                                          |   11 
 fs/quota/dquot.c                                             |    5 
 fs/udf/unicode.c                                             |    2 
 include/linux/clk.h                                          |   80 
 include/linux/raid_class.h                                   |    4 
 include/linux/virtio_net.h                                   |    4 
 include/media/v4l2-mem2mem.h                                 |   18 
 include/net/bonding.h                                        |   25 
 include/net/sock.h                                           |   11 
 kernel/sched/rt.c                                            |    5 
 kernel/trace/trace.c                                         |    9 
 kernel/trace/trace_irqsoff.c                                 |    3 
 kernel/trace/trace_sched_wakeup.c                            |    2 
 lib/clz_ctz.c                                                |   32 
 lib/mpi/longlong.h                                           |   36 
 lib/test_firmware.c                                          |   37 
 net/batman-adv/bat_v_elp.c                                   |    3 
 net/batman-adv/bat_v_ogm.c                                   |    7 
 net/batman-adv/hard-interface.c                              |   14 
 net/batman-adv/soft-interface.c                              |    3 
 net/batman-adv/translation-table.c                           |    1 
 net/batman-adv/types.h                                       |    6 
 net/bluetooth/l2cap_core.c                                   |    5 
 net/core/rtnetlink.c                                         |    5 
 net/core/sock.c                                              |    2 
 net/dccp/proto.c                                             |   20 
 net/ipv4/ip_vti.c                                            |    4 
 net/ipv4/tcp_timer.c                                         |    4 
 net/ipv6/ip6_vti.c                                           |    4 
 net/key/af_key.c                                             |    4 
 net/netfilter/ipvs/ip_vs_ctl.c                               |   74 
 net/netfilter/nf_conntrack_proto_sctp.c                      |    6 
 net/netfilter/nf_queue.c                                     |    2 
 net/netfilter/nft_dynset.c                                   |    3 
 net/sched/sch_api.c                                          |   53 
 net/sctp/socket.c                                            |    2 
 net/unix/af_unix.c                                           |    9 
 net/xfrm/Makefile                                            |    2 
 net/xfrm/xfrm_interface.c                                    |  996 -----------
 net/xfrm/xfrm_interface_core.c                               |  996 +++++++++++
 net/xfrm/xfrm_user.c                                         |   13 
 security/integrity/ima/Kconfig                               |    2 
 sound/pci/emu10k1/emufx.c                                    |  112 -
 sound/soc/codecs/rt5665.c                                    |    2 
 sound/soc/meson/axg-tdm-formatter.c                          |   42 
 sound/usb/quirks-table.h                                     |   29 
 tools/testing/selftests/net/forwarding/mirror_gre_changes.sh |    3 
 tools/testing/selftests/net/forwarding/tc_flower.sh          |    8 
 154 files changed, 4345 insertions(+), 3856 deletions(-)

Abel Wu (1):
sock: Fix misuse of sk_under_memory_pressure()

Alessio Igor Bogani (1):
igb: Avoid starting unnecessary workqueues

Alexander Aring (5):
dlm: improve plock logging if interrupted
fs: dlm: add pid to debug log
fs: dlm: change plock interrupted message to debug again
fs: dlm: use dlm_plock_info for do_unlock_close
fs: dlm: fix mismatch of plock results from userspace

Alexander Stein (1):
Revert "tty: serial: fsl_lpuart: drop earlycon entry for i.MX8QXP"

Andrii Staikov (1):
i40e: fix misleading debug logs

Armin Wolf (1):
pcmcia: rsrc_nonstatic: Fix memory leak in nonstatic_release_resource_db()

Benjamin Coddington (1):
nfsd: Fix race to FREE_STATEID and cl_revoked

Biju Das (1):
clk: Fix undefined reference to `clk_rate_exclusive_{get,put}'

Christophe Leroy (6):
powerpc/mm: move platform specific mmu-xxx.h in platform directories powerpc/mm: Move pgtable_t into platform headers powerpc/mm: dump segment registers on book3s/32 powerpc/mm: dump block address translation on book3s/32
powerpc: Move page table dump files in a dedicated subdirectory powerpc/32: add stack protector support

Cosmin Tanislav (1):
iio: add addac subdirectory

Eric Dumazet (3):
net: do not allow gso_size to be set to GSO_BY_FRAGS
sock: annotate data-races around prot->memory_pressure
dccp: annotate data-races in dccp_poll()

Eyal Birger (1):
xfrm: interface: rename xfrm_interface.c to xfrm_interface_core.c

Feng Tang (1):
x86/fpu: Set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4

Greg Kroah-Hartman (1):

      Linux 4.19.293

Gustavo A. R. Silva (1):
MIPS: dec: prom: Address -Warray-bounds warning

Hangbin Liu (1):
bonding: fix macvlan over alb bond support

Hans Verkuil (1):
media: platform: mediatek: vpu: fix NULL ptr dereference

Helge Deller (1):

      lib/clz_ctz.c: Fix __clzdi2() and __ctzdi2() for 32-bit kernels

Ido Schimmel (2):
selftests: forwarding: tc_flower: Relax success criterion
rtnetlink: Reject negative ifindexes in RTM_NEWLINK

Igor Mammedov (2):
PCI: acpiphp: Reassign resources on bridge if necessary
PCI: acpiphp: Use pci_assign_unassigned_bridge_resources() only for non-root bus

Immad Mir (2):
FS: JFS: Fix null-ptr-deref Read in txBegin
FS: JFS: Check for read-only mounted filesystem in txBegin

J. Bruce Fields (1):
nfsd4: kill warnings on testing stateids with mismatched clientids

Jakob Koschel (1):
dlm: replace usage of found with dedicated list iterator variable

Jakub Kicinski (1):
net: remove bond_slave_has_mac_rcu()

Jamal Hadi Salim (1):
net/sched: fix a qdisc modification with ambiguous command request

Jan Kara (2):
quota: Properly disable quotas when add_dquot_ref() fails
udf: Fix uninitialized array access for some pathnames

Jason Wang (1):
virtio-net: set queues after driver_ok

Jason Xing (1):
net: fix the RTO timer retransmitting skb every 1ms if linear option is enabled

Jerome Brunet (2):
mmc: meson-gx: remove useless lock
ASoC: meson: axg-tdm-formatter: fix channel slot allocation

Jiaxun Yang (4):
irqchip/mips-gic: Use raw spinlock for gic_lock
MIPS: cpu-features: Enable octeon_cache by cpu_type
MIPS: cpu-features: Use boot_cpu_type for CPU type based features irqchip/mips-gic: Don't touch vl_map if a local interrupt is not routable

Johan Hovold (1):
USB: dwc3: qcom: fix NULL-deref on suspend

Josip Pavic (1):
drm/amd/display: do not wait for mpc idle if tg is disabled

Junwei Hu (1):
ipvs: Improve robustness to the ipvs sysctl

Justin Chen (1):
net: phy: broadcom: stub c45 read/write for 54810

Kuniyuki Iwashima (1):
af_unix: Fix null-ptr-deref in unix_stream_sendpage().

Lin Ma (4):
net: xfrm: Fix xfrm_address_filter OOB read
net: af_key: fix sadb_x_filter validation
xfrm: add NULL check in xfrm_update_ae_params
net: xfrm: Amend XFRMA_SEC_CTX nla_policy structure

Marc Zyngier (1):
irqchip/mips-gic: Get rid of the reliance on irq_cpu_online()

Marco Morandini (1):
HID: add quirk for 03f0:464a HP Elite Presenter Mouse

Mark Brown (1):
regmap: Account for register length in SMBus I/O limits

Martin Hundebøll (1):
mmc: meson-gx: remove redundant mmc_request_done() call from irq context

Masahiro Yamada (3):
mmc: tmio: replace tmio_mmc_clk_stop() calls with tmio_mmc_set_clock()
mmc: tmio: move tmio_mmc_set_clock() to platform hook
powerpc: remove leftover code of old GCC version checks

Michael Ellerman (2):
powerpc/64s/radix: Fix soft dirty tracking
ibmveth: Use dcbf rather than dcbfl

Michael Schmitz (1):
block: fix signed int overflow in Amiga partition support

Mikulas Patocka (2):
dm integrity: increase RECALC_SECTORS to improve recalculate speed dm integrity: reduce vmalloc space footprint on 32-bit architectures

Mirsad Goran Todorovac (1):
test_firmware: prevent race conditions by a correct implementation of locking

Nathan Chancellor (1):
lib/mpi: Eliminate unused umul_ppmm definitions for MIPS

Nathan Lynch (1):
powerpc/rtas_flash: allow user copy to flash block cache objects

Naveen N Rao (1):
powerpc: Fail build if using recordmcount with binutils v2.37

Oswald Buddenhagen (1):
ALSA: emu10k1: roll up loops in DSP setup code for Audigy

Pablo Neira Ayuso (1):
netfilter: nft_dynset: disallow object maps

Petr Machata (1):
selftests: mirror_gre_changes: Tighten up the TTL test match

Pietro Borrello (1):
sched/rt: pick_next_rt_entity(): check list_entry

Randy Dunlap (1):
IMA: allow/fix UML builds

Remi Pommarel (3):
batman-adv: Do not get eth header before batadv_check_management_packet
batman-adv: Fix TT global entry leak when client roamed back
batman-adv: Fix batadv_v_ogm_aggr_send memory leak

Rob Clark (1):
dma-buf/sw_sync: Avoid recursive lock during fence signal

Russell Harmon via samba-technical (1):
cifs: Release folio lock on fscache read hit.

Sandeep Maheswaram (1):
usb: dwc3: qcom: Add helper functions to enable,disable wake irqs

Sergey Shtylyov (2):
mmc: bcm2835: fix deferred probing
mmc: sunxi: fix deferred probing

Sherry Sun (1):
tty: serial: fsl_lpuart: add earlycon for imx8ulp platform

Sishuai Gong (1):
ipvs: fix racy memcpy in proc_do_sync_threshold

Stephen Boyd (1):
mmc: Remove dev_err() usage after platform_get_irq()

Sven Eckelmann (2):
batman-adv: Trigger events for auto adjusted MTU
batman-adv: Don't increase MTU when set by user

Taimur Hassan (1):
drm/amd/display: check TG is non-null before checking if enabled

Tang Bin (1):
virtio-mmio: Use to_virtio_mmio_device() to simply code

Thomas Zimmermann (2):
fbdev: Improve performance of sys_imageblit()
fbdev: Fix sys_imageblit() for arbitrary image widths

Tony Lindgren (1):

      serial: 8250: Fix oops for port->pm on uart_change_pm()

Trond Myklebust (1):
nfsd: Remove incorrect check in nfsd4_validate_stateid

Tuo Li (1):
gfs2: Fix possible data races in gfs2_show_options()

Vamsi Krishna Brahmajosyula (1):
netfilter: nf_queue: fix socket leak

Wei Chen (1):
media: vcodec: Fix potential array out-of-bounds in encoder queue_setup

William Breathitt Gray (4):
iio: adc: stx104: Utilize iomap interface
iio: adc: stx104: Implement and utilize register structures
iio: addac: stx104: Fix race condition for stx104_write_raw()
iio: addac: stx104: Fix race condition when converting analog-to-digital

Wolfram Sang (1):
virtio-mmio: don't break lifecycle of vm_dev

Xin Long (1):
netfilter: set default timeout to 3 secs for sctp shutdown send and recv state

Yang Yingliang (1):
mmc: wbsd: fix double mmc_free_host() in wbsd_init()

Yangtao Li (1):
virtio-mmio: convert to devm_platform_ioremap_resource

Ye Bin (1):
quota: fix warning in dqgrab()

Yibin Ding (1):
mmc: block: Fix in_flight[issue_type] value error

Yogesh (1):
fs: jfs: Fix UBSAN: array-index-out-of-bounds in dbAllocDmapLev

Yuanjun Gong (1):
fbdev: mmp: fix value check in mmphw_probe()

Yunfei Dong (1):
media: v4l2-mem2mem: add lock to protect parameter num_rdy

Zhang Rui (1):
x86/topology: Fix erroneous smp_num_siblings on Intel Hybrid platforms

Zhang Shurong (2):
ASoC: rt5665: add missed regulator_bulk_disable
fbdev: fix potential OOB read in fast_imageblit()

Zheng Yejian (1):
tracing: Fix memleak due to race between current_tracer and trace

Zhengchao Shao (3):
xfrm: fix slab-use-after-free in decode_session6
ip6_vti: fix slab-use-after-free in decode_session6
ip_vti: fix potential slab-use-after-free in decode_session6

Zhengping Jiang (1):
Bluetooth: L2CAP: Fix use-after-free

Zhu Wang (2):
scsi: snic: Fix double free in snic_tgt_create()
scsi: core: raid_class: Remove raid_component_add()

Ziyang Xuan (1):
team: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves

dengxiang (1):
ALSA: usb-audio: Add support for Mythware XA001AU capture and playback interfaces.

hackyzh002 (1):
drm/radeon: Fix integer overflow in radeon_cs_parser_init

shanzhulig (1):
drm/amdgpu: Fix potential fence use-after-free v2

xiaoshoukui (1):
btrfs: fix BUG_ON condition in btrfs_cancel_balance

index fcd6a9b17301..5965df0393fd 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 19
-SUBLEVEL = 292
+SUBLEVEL = 293
 EXTRAVERSION =
 NAME = "People's Front"
 

index 4e2ee743088f..51faee420745 100644
@@ -111,7 +111,24 @@
 #define cpu_has_tx39_cache	__opt(MIPS_CPU_TX39_CACHE)
 #endif
 #ifndef cpu_has_octeon_cache
-#define cpu_has_octeon_cache	0
+#define cpu_has_octeon_cache						\
+({									\
+	int __res;							\
+									\
+	switch (boot_cpu_type()) {					\
+	case CPU_CAVIUM_OCTEON:						\
+	case CPU_CAVIUM_OCTEON_PLUS:					\
+	case CPU_CAVIUM_OCTEON2:					\
+	case CPU_CAVIUM_OCTEON3:					\
+		__res = 1;						\
+		break;							\
+									\
+	default:							\
+		__res = 0;						\
+	}								\
+									\
+	__res;								\
+})
 #endif
 /* Don't override `cpu_has_fpu' to 1 or the "nofpu" option won't work.  */
 #ifndef cpu_has_fpu

@@ -332,7 +349,7 @@
 ({									\
 	int __res;							\
 									\
-	switch (current_cpu_type()) {					\
+	switch (boot_cpu_type()) {					\
 	case CPU_M14KC:							\
 	case CPU_74K:							\
 	case CPU_1074K:							\

index 09538ff5e924..6f0405ba27d6 100644
@@ -74,7 +74,7 @@ static inline bool prom_is_rex(u32 magic)
  */
 typedef struct {
 	int pagesize;
-	unsigned char bitmap[0];
+	unsigned char bitmap[];
 } memmap;
 
 

index f0e09d5f0bed..3be56d857d57 100644
@@ -181,6 +181,7 @@ config PPC
 	select HAVE_ARCH_SECCOMP_FILTER
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_CBPF_JIT			if !PPC64
+	select HAVE_STACKPROTECTOR		if $(cc-option,-mstack-protector-guard=tls) && PPC32
 	select HAVE_CONTEXT_TRACKING		if PPC64
 	select HAVE_DEBUG_KMEMLEAK
 	select HAVE_DEBUG_STACKOVERFLOW

index 923b3b794d13..1f54bb93b5cc 100644
@@ -368,10 +368,6 @@ config PPC_PTDUMP
 
 	  If you are unsure, say N.
 
-config PPC_HTDUMP
-	def_bool y
-	depends on PPC_PTDUMP && PPC_BOOK3S_64
-
 config PPC_FAST_ENDIAN_SWITCH
 	bool "Deprecated fast endian-switch syscall"
         depends on DEBUG_KERNEL && PPC_BOOK3S_64

index b2e0fd873562..daddada1a390 100644
@@ -113,6 +113,9 @@ KBUILD_LDFLAGS	+= -m elf$(BITS)$(LDEMULATION)
 KBUILD_ARFLAGS	+= --target=elf$(BITS)-$(GNUTARGET)
 endif
 
+cflags-$(CONFIG_STACKPROTECTOR)	+= -mstack-protector-guard=tls
+cflags-$(CONFIG_STACKPROTECTOR)	+= -mstack-protector-guard-reg=r2
+
 LDFLAGS_vmlinux-y := -Bstatic
 LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie
 LDFLAGS_vmlinux	:= $(LDFLAGS_vmlinux-y)

@@ -419,9 +422,12 @@ archclean:
 
 archprepare: checkbin
 
-# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
-# to stdout and these checks are run even on install targets.
-TOUT	:= .tmp_gas_check
+ifdef CONFIG_STACKPROTECTOR
+prepare: stack_protector_prepare
+
+stack_protector_prepare: prepare0
+	$(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h))
+endif
 
 # Check toolchain versions:
 # - gcc-4.6 is the minimum kernel-wide version so nothing required.

@@ -433,7 +439,11 @@ checkbin:
 		echo -n '*** Please use a different binutils version.' ; \
 		false ; \
 	fi
-
-
-CLEAN_FILES += $(TOUT)
-
+	@if test "x${CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT}" = "xy" -a \
+		"x${CONFIG_LD_IS_BFD}" = "xy" -a \
+		"${CONFIG_LD_VERSION}" = "23700" ; then \
+		echo -n '*** binutils 2.37 drops unused section symbols, which recordmcount ' ; \
+		echo 'is unable to handle.' ; \
+		echo '*** Please use a different binutils version.' ; \
+		false ; \
+	fi

index e38c91388c40..958b18cecc96 100644
@@ -34,14 +34,20 @@
 #define BAT_PHYS_ADDR(x) ((u32)((x & 0x00000000fffe0000ULL) | \
 				((x & 0x0000000e00000000ULL) >> 24) | \
 				((x & 0x0000000100000000ULL) >> 30)))
+#define PHYS_BAT_ADDR(x) (((u64)(x) & 0x00000000fffe0000ULL) | \
+			  (((u64)(x) << 24) & 0x0000000e00000000ULL) | \
+			  (((u64)(x) << 30) & 0x0000000100000000ULL))
 #else
 #define BAT_PHYS_ADDR(x) (x)
+#define PHYS_BAT_ADDR(x) ((x) & 0xfffe0000)
 #endif
 
 struct ppc_bat {
 	u32 batu;
 	u32 batl;
 };
+
+typedef struct page *pgtable_t;
 #endif /* !__ASSEMBLY__ */
 
 /*

index 9c8c669a6b6a..488e7ed07e96 100644
@@ -2,6 +2,8 @@
 #ifndef _ASM_POWERPC_BOOK3S_64_MMU_H_
 #define _ASM_POWERPC_BOOK3S_64_MMU_H_
 
+#include <asm/page.h>
+
 #ifndef __ASSEMBLY__
 /*
  * Page size definition

@@ -24,6 +26,13 @@ struct mmu_psize_def {
 };
 extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
 
+/*
+ * For BOOK3s 64 with 4k and 64K linux page size
+ * we want to use pointers, because the page table
+ * actually store pfn
+ */
+typedef pte_t *pgtable_t;
+
 #endif /* __ASSEMBLY__ */
 
 /* 64-bit classic hash table MMU */

index 13ea441ac531..2b396de45e9e 100644
@@ -326,18 +326,8 @@ static inline void mmu_early_init_devtree(void) { }
 #if defined(CONFIG_PPC_STD_MMU_32)
 /* 32-bit classic hash table MMU */
 #include <asm/book3s/32/mmu-hash.h>
-#elif defined(CONFIG_40x)
-/* 40x-style software loaded TLB */
-#  include <asm/mmu-40x.h>
-#elif defined(CONFIG_44x)
-/* 44x-style software loaded TLB */
-#  include <asm/mmu-44x.h>
-#elif defined(CONFIG_PPC_BOOK3E_MMU)
-/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
-#  include <asm/mmu-book3e.h>
-#elif defined (CONFIG_PPC_8xx)
-/* Motorola/Freescale 8xx software loaded TLB */
-#  include <asm/mmu-8xx.h>
+#elif defined(CONFIG_PPC_MMU_NOHASH)
+#include <asm/nohash/mmu.h>
 #endif
 
 #endif /* __KERNEL__ */

new file mode 100644
index 000000000000..f61f933a4cd8
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_POWERPC_NOHASH_32_MMU_H_
+#define _ASM_POWERPC_NOHASH_32_MMU_H_
+
+#if defined(CONFIG_40x)
+/* 40x-style software loaded TLB */
+#include <asm/nohash/32/mmu-40x.h>
+#elif defined(CONFIG_44x)
+/* 44x-style software loaded TLB */
+#include <asm/nohash/32/mmu-44x.h>
+#elif defined(CONFIG_PPC_BOOK3E_MMU)
+/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
+#include <asm/nohash/mmu-book3e.h>
+#elif defined (CONFIG_PPC_8xx)
+/* Motorola/Freescale 8xx software loaded TLB */
+#include <asm/nohash/32/mmu-8xx.h>
+#endif
+
+#ifndef __ASSEMBLY__
+typedef struct page *pgtable_t;
+#endif
+
+#endif /* _ASM_POWERPC_NOHASH_32_MMU_H_ */

new file mode 100644
index 000000000000..e6585480dfc4
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_POWERPC_NOHASH_64_MMU_H_
+#define _ASM_POWERPC_NOHASH_64_MMU_H_
+
+/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */
+#include <asm/nohash/mmu-book3e.h>
+
+#ifndef __ASSEMBLY__
+typedef struct page *pgtable_t;
+#endif
+
+#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */

new file mode 100644
index 000000000000..a037cb1efb57
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_POWERPC_NOHASH_MMU_H_
+#define _ASM_POWERPC_NOHASH_MMU_H_
+
+#ifdef CONFIG_PPC64
+#include <asm/nohash/64/mmu.h>
+#else
+#include <asm/nohash/32/mmu.h>
+#endif
+
+#endif /* _ASM_POWERPC_NOHASH_MMU_H_ */

index f6a1265face2..ddfb4b965e5b 100644
@@ -335,20 +335,6 @@ void arch_free_page(struct page *page, int order);
 #endif
 
 struct vm_area_struct;
-#ifdef CONFIG_PPC_BOOK3S_64
-/*
- * For BOOK3s 64 with 4k and 64K linux page size
- * we want to use pointers, because the page table
- * actually store pfn
- */
-typedef pte_t *pgtable_t;
-#else
-#if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_PPC64)
-typedef pte_t *pgtable_t;
-#else
-typedef struct page *pgtable_t;
-#endif
-#endif
 
 #include <asm-generic/memory_model.h>
 #endif /* __ASSEMBLY__ */

new file mode 100644
index 000000000000..d05d969c98c2
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * GCC stack protector support.
+ *
+ */
+
+#ifndef _ASM_STACKPROTECTOR_H
+#define _ASM_STACKPROTECTOR_H
+
+#include <linux/random.h>
+#include <linux/version.h>
+#include <asm/reg.h>
+#include <asm/current.h>
+
+/*
+ * Initialize the stackprotector canary value.
+ *
+ * NOTE: this must only be called from functions that never return,
+ * and it must always be inlined.
+ */
+static __always_inline void boot_init_stack_canary(void)
+{
+	unsigned long canary;
+
+	/* Try to get a semi random initial value. */
+	canary = get_random_canary();
+	canary ^= mftb();
+	canary ^= LINUX_VERSION_CODE;
+	canary &= CANARY_MASK;
+
+	current->stack_canary = canary;
+}
+
+#endif	/* _ASM_STACKPROTECTOR_H */

index bf19c5514d6c..cccea292af68 100644
@@ -21,6 +21,8 @@ CFLAGS_prom_init.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
 CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
 CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
 
+CFLAGS_prom_init.o += $(call cc-option, -fno-stack-protector)
+
 ifdef CONFIG_FUNCTION_TRACER
 # Do not trace early boot code
 CFLAGS_REMOVE_cputable.o = $(CC_FLAGS_FTRACE)

index 50400f213bbf..c2288c73d56d 100644
@@ -79,6 +79,9 @@ int main(void)
 {
 	OFFSET(THREAD, task_struct, thread);
 	OFFSET(MM, task_struct, mm);
+#ifdef CONFIG_STACKPROTECTOR
+	OFFSET(TASK_CANARY, task_struct, stack_canary);
+#endif
 	OFFSET(MMCONTEXTID, mm_struct, context.id);
 #ifdef CONFIG_PPC64
 	DEFINE(SIGSEGV, SIGSEGV);

index 8d142e5d84cd..5fbc890d1094 100644
@@ -17,7 +17,7 @@
 #include <asm/processor.h>
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
-#include <asm/mmu-book3e.h>
+#include <asm/nohash/mmu-book3e.h>
 #include <asm/asm-offsets.h>
 #include <asm/mpc85xx.h>
 

index 10fabae2574d..ddab3488cadb 100644
@@ -714,9 +714,9 @@ static int __init rtas_flash_init(void)
 	if (!rtas_validate_flash_data.buf)
 		return -ENOMEM;
 
-	flash_block_cache = kmem_cache_create("rtas_flash_cache",
-					      RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
-					      NULL);
+	flash_block_cache = kmem_cache_create_usercopy("rtas_flash_cache",
+						       RTAS_BLK_SIZE, RTAS_BLK_SIZE,
+						       0, 0, RTAS_BLK_SIZE, NULL);
 	if (!flash_block_cache) {
 		printk(KERN_ERR "%s: failed to create block cache\n",
 				__func__);

index 94f04fcb373e..962ee90a0dfe 100644
@@ -20,7 +20,7 @@
 #define KVM_E500_H
 
 #include <linux/kvm_host.h>
-#include <asm/mmu-book3e.h>
+#include <asm/nohash/mmu-book3e.h>
 #include <asm/tlb.h>
 #include <asm/cputhreads.h>
 

index 3c844bdd16c4..d4648a1e6e6c 100644
@@ -42,13 +42,5 @@ obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o
 obj-$(CONFIG_HIGHMEM)		+= highmem.o
 obj-$(CONFIG_PPC_COPRO_BASE)	+= copro_fault.o
 obj-$(CONFIG_SPAPR_TCE_IOMMU)	+= mmu_context_iommu.o
-obj-$(CONFIG_PPC_PTDUMP)	+= dump_linuxpagetables.o
-ifdef CONFIG_PPC_PTDUMP
-obj-$(CONFIG_4xx)		+= dump_linuxpagetables-generic.o
-obj-$(CONFIG_PPC_8xx)		+= dump_linuxpagetables-8xx.o
-obj-$(CONFIG_PPC_BOOK3E_MMU)	+= dump_linuxpagetables-generic.o
-obj-$(CONFIG_PPC_BOOK3S_32)	+= dump_linuxpagetables-generic.o
-obj-$(CONFIG_PPC_BOOK3S_64)	+= dump_linuxpagetables-book3s64.o
-endif
-obj-$(CONFIG_PPC_HTDUMP)	+= dump_hashpagetable.o
+obj-$(CONFIG_PPC_PTDUMP)	+= ptdump/
 obj-$(CONFIG_PPC_MEM_KEYS)	+= pkeys.o

deleted file mode 100644
index 5d513636de73..000000000000

index 9ee235fca427..75cbedaac5d2 100644

new file mode 100644
index 000000000000..712762be3cb1

new file mode 100644
index 000000000000..5d513636de73

index 561a67d65e4d..923bfb340433 100644

index 71ca064e3794..31fe56a90cbf 100644

index 7d372db8bee1..e33b732ad337 100644

index 560936617d9c..4a4160221183 100644

index 056acde5e7d3..4b9d68af090b 100644

index 81ba4eb34890..09d369306ee3 100644

index e667bcf64bc7..70e446c2acf8 100644

index ead221ccb93e..ddec675ba690 100644

index 1ae31dbc61c6..5e61abb3dce5 100644

index c0ba8d6f4978..a9d6f8acf70b 100644

index 8de294aa3184..a2ab338166e6 100644

index d08aeb41cd07..810e72e4e8b7 100644

index cb5993251381..a60d0cbfe4cd 100644

new file mode 100644
index 000000000000..2e64d7755d5e

new file mode 100644
index 000000000000..b888b9ee12da

index 0a4e440948f0..234464c1c050 100644

index 6ad408514a99..193a1f800a22 100644

index 9b57fb285728..46ec1f2699aa 100644

index 88114e576efb..039058fe6a41 100644

index 5301302fb531..2b3ff4be7ae0 100644

index 864338e308e2..b8fb518c6db0 100644

index dba98c2886f2..28f07d410043 100644

index 6215feb976e3..a0e8ac912445 100644

index f77493604312..ca2239ea6d96 100644

index 4970cd40813b..feede31fab47 100644

index 02bea6159d79..ac380c54bd17 100644

index 9ef89d00970e..936d88a33a67 100644

index ca9e05440da1..ee8160d6015e 100644

index 757eb175611f..bc3f8a1df10c 100644

index 7c40a7e1fea1..358aa258cb15 100644

index 9b15431d961c..1df3ea9e5d6f 100644

index 3fc439d92445..e03f4883858a 100644

index 75a1915d95aa..23997f1c2619 100644

index 0299e5bbb902..10e9e60f6cf7 100644

index 29ced6b74d36..be2e743e65de 100644

index 94622d119abc..49fb62d02a76 100644

index d80bc5f59b3f..8b5e1ec6aabf 100644

index 03e0f8060cc2..331d74f9281b 100644

index 3d8844e7090a..72a289d73dfc 100644

index 123420cac6b5..b75b12c2c702 100644

index 388ba2ebcce5..02b80291c136 100644

index 66de3a59f577..d3161be35b1b 100644

index 36321d810d36..af23d41b9843 100644

index fcdbb2df137f..2277d64310ab 100644

index 17cd682acc22..07be3a374efb 100644

index 0294f519c29e..b69d6f7012f4 100644

index 7b482489bd22..0613b86cc3fd 100644

index ce2aa54ca2e2..98b710cc9cf3 100644

index bb0eaa4638e3..29157f7d9663 100644

index 07b9df8938f2..63ad6b1d575a 100644

index 78789c5ed36b..e10db01f253b 100644

index 14528c0ffe63..c2c439acbb78 100644

index 78191320f8e2..e958181b7361 100644

index 770a2b143485..303987d29b9c 100644

index 5fcfa96463eb..85521d6b0237 100644

index ec8655514283..c868bb927c3d 100644

index faee73c084d4..d49c1aad2464 100644

index d655720e16a1..62c67e9e190c 100644

index c458f084f7bb..7d317434e3d1 100644

index 72739f72e4b9..373e34b46a3c 100644

index 9c6c3572b131..394c66442cff 100644

index 9da7b10e56d2..f44c8f1fd3ec 100644

index 98ea6d28df15..0f36bb59970d 100644

index 11f4dbd9526b..8041bd5e4262 100644

index 2e11e48446ab..ca0582d33532 100644

index 6c5229f98c9e..cac4e5aee739 100644

index b5e779bcfb34..be3baea88b61 100644

index af3da6cdfc79..17100d9ceaf0 100644

index 04a620fd1301..5d4232d8d651 100644

index 6d68cdb9dd77..0d5519fcb438 100644

index 1003abb8cc35..7447dbd305fc 100644

index 6bdb70c93e3f..c64d58c1b724 100644

index 37598ae1d3f7..34c18f72a41b 100644

index fcc471f92189..9346fae5d664 100644

index 79f62517e24a..794db633f1c9 100644

index 3e6da3694a5a..4e3ed80a68ce 100644

index 27de4dc1ff51..c4ea0159ce2e 100644

index 15c71b08c2df..a3536dfe9b16 100644

index 84069db0423a..d8d28ba169b4 100644

index 866ce815625e..a64050e77588 100644

index b8456e2f1167..47ffa69ca6f6 100644

index cadeb22a48f2..8453e92936ac 100644

index 84c59de27882..b3a0385290a1 100644

index 651c9784904c..a4c6aba7da7e 100644

index baa825751c39..432dccd37506 100644

index 8971341c4f8a..402060cf3198 100644

index fbc4552d17b8..6e5e307f985e 100644

index 94c7ebc26c48..699e544b4bfd 100644

index 3ec45028a8c5..cd32fe3311af 100644

index 6ba99f5ed3f4..a7ed2a19c3ec 100644

index e72f744bc305..6c546f520f99 100644

index 135902aa8b11..a372863c9efd 100755

index 20d1077e5a3d..85faef980887 100755

Part of the diff is not shown here. View the raw message.