Merge tag 'probes-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

Pull probes updates from Masami Hiramatsu:
 "Cleanups:

   - kprobes: Fixes typo in kprobes samples

   - tracing/eprobes: Remove 'break' after return

  kretprobe/fprobe performance improvements:

   - lib: Introduce new `objpool`, which is a high performance lockless
     object queue. This uses per-cpu ring array to allocate/release
     objects from the pre-allocated object pool.

     Since the index of ring array is a 32bit sequential counter, we can
     retry to push/pop the object pointer from the ring without lock (as
     seq-lock does)

   - lib: Add an objpool test module to test the functionality and
     evaluate the performance under some circumstances

   - kprobes/fprobe: Improve kretprobe and rethook scalability
     performance with objpool.

     This improves both legacy kretprobe and fprobe exit handler (which
     is based on rethook) to be scalable on SMP systems. Even with
     8-threads parallel test, it shows a great scalability improvement

   - Remove unneeded freelist.h which is replaced by objpool

   - objpool: Add maintainers entry for the objpool

   - objpool: Fix to remove unused include header lines"

* tag 'probes-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  kprobes: unused header files removed
  MAINTAINERS: objpool added
  kprobes: freelist.h removed
  kprobes: kretprobe scalability improvement
  lib: objpool test module added
  lib: objpool added: ring-array based lockless MPMC
  tracing/eprobe: drop unneeded breaks
  samples: kprobes: Fixes a typo

diff --combined MAINTAINERS
index 6f0dda0603b84875f597b14555e58a10c2756776,e80e727077d538817a371d853d25f7121903a00f..14e1194faa4b231fb5dfdcafcedb82c8ff36d953
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -378,9 -378,8 +378,9 @@@ F: drivers/acpi/viot.
  F:    include/linux/acpi_viot.h
  
  ACPI WMI DRIVER
 +M:    Armin Wolf <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/driver-api/wmi.rst
  F:    Documentation/wmi/
  F:    drivers/platform/x86/wmi.c
@@@ -471,6 -470,7 +471,6 @@@ F: drivers/hwmon/adm1029.
  ADM8211 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
@@@ -1460,6 -1460,7 +1460,6 @@@ F:      drivers/hwmon/applesmc.
  APPLETALK NETWORK LAYER
  L:    [email protected]
  S:    Odd fixes
 -F:    drivers/net/appletalk/
  F:    include/linux/atalk.h
  F:    include/uapi/linux/atalk.h
  F:    net/appletalk/
@@@ -1584,17 -1585,6 +1584,17 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM GENERIC INTERRUPT CONTROLLER DRIVERS
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,gic*
 +F:    arch/arm/include/asm/arch_gicv3.h
 +F:    arch/arm64/include/asm/arch_gicv3.h
 +F:    drivers/irqchip/irq-gic*.[ch]
 +F:    include/linux/irqchip/arm-gic*.h
 +F:    include/linux/irqchip/arm-vgic-info.h
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1636,13 -1626,13 +1636,13 @@@ F:   drivers/gpu/drm/arm/display/include
  F:    drivers/gpu/drm/arm/display/komeda/
  
  ARM MALI PANFROST DRM DRIVER
 +M:    Boris Brezillon <[email protected]>
  M:    Rob Herring <[email protected]>
 -M:    Tomeu Vizoso <[email protected]>
  R:    Steven Price <[email protected]>
 -R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/panfrost.rst
  F:    drivers/gpu/drm/panfrost/
  F:    include/uapi/drm/panfrost_drm.h
  
@@@ -1798,7 -1788,7 +1798,7 @@@ F:      drivers/irqchip/irq-owl-sirq.
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/net/ethernet/actions/
  F:    drivers/pinctrl/actions/*
 -F:    drivers/soc/actions/
 +F:    drivers/pmdomain/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/dt-bindings/reset/actions,*
  F:    include/linux/soc/actions/
@@@ -1826,13 -1816,6 +1826,13 @@@ N:    allwinne
  N:    sun[x456789]i
  N:    sun[25]0i
  
 +ARM/AMD PENSANDO ARM64 ARCHITECTURE
 +M:    Brad Larson <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/*/amd,pensando*
 +F:    arch/arm64/boot/dts/amd/elba*
 +
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  M:    Neil Armstrong <[email protected]>
  M:    Jerome Brunet <[email protected]>
@@@ -2228,28 -2211,21 +2228,28 @@@ F:   arch/arm/boot/dts/ti/omap/omap3-igep
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 -F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/boot/dts/intel/ixp/
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  F:    drivers/clocksource/timer-ixp4xx.c
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    include/linux/soc/ixp4xx/qmgr.h
  
  ARM/INTEL KEEMBAY ARCHITECTURE
  M:    Paul J. Murphy <[email protected]>
@@@ -2351,7 -2327,7 +2351,7 @@@ F:      drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 -R:    AngeloGioacchino Del Regno <[email protected]>
 +M:    AngeloGioacchino Del Regno <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -3488,14 -3464,6 +3488,14 @@@ W:    http://bcache.evilpiepirate.or
  C:    irc://irc.oftc.net/bcache
  F:    drivers/md/bcache/
  
 +BCACHEFS
 +M:    Kent Overstreet <[email protected]>
 +R:    Brian Foster <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    fs/bcachefs/
 +
  BDISP ST MEDIA DRIVER
  M:    Fabien Dessenne <[email protected]>
  L:    [email protected]
@@@ -3628,10 -3596,9 +3628,10 @@@ F:    Documentation/devicetree/bindings/ii
  F:    drivers/iio/accel/bma400*
  
  BPF JIT for ARM
 -M:    Shubham Bansal <[email protected]>
 +M:    Russell King <[email protected]>
 +M:    Puranjay Mohan <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Maintained
  F:    arch/arm/net/
  
  BPF JIT for ARM64
@@@ -3811,15 -3778,6 +3811,15 @@@ L:    [email protected]
  S:    Odd Fixes
  K:    (?:\b|_)bpf(?:\b|_)
  
 +BPF [NETKIT] (BPF-programmable network device)
 +M:    Daniel Borkmann <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/netkit.c
 +F:    include/net/netkit.h
 +
  BPF [NETWORKING] (struct_ops, reuseport)
  M:    Martin KaFai Lau <[email protected]>
  L:    [email protected]
@@@ -4362,7 -4320,8 +4362,7 @@@ F:      drivers/net/ethernet/broadcom/bcmsys
  F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <[email protected]>
 -M:    Prashant Sreedharan <[email protected]>
 +M:    Pavan Chebbi <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4835,13 -4794,6 +4835,13 @@@ X:    drivers/char/ipmi
  X:    drivers/char/random.c
  X:    drivers/char/tpm/
  
 +CHARGERLAB POWER-Z HARDWARE MONITOR DRIVER
 +M:    Thomas Weißschuh <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/powerz.rst
 +F:    drivers/hwmon/powerz.c
 +
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
  M:    Joe Perches <[email protected]>
@@@ -5098,14 -5050,6 +5098,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/timer/
  F:    drivers/clocksource/
  
 +CLOSURES
 +M:    Kent Overstreet <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/closure.h
 +F:    lib/closure.c
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  M:    Daniel Oliveira Nascimento <[email protected]>
@@@ -5365,6 -5309,12 +5365,6 @@@ M:     Bence Csókás <[email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cp2615.c
  
 -CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/ti/cpmac.c
 -
  CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
  M:    Viresh Kumar <[email protected]>
  M:    Sudeep Holla <[email protected]>
@@@ -6035,9 -5985,8 +6035,9 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
  M:    Mike Snitzer <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 +M:    Mikulas Patocka <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
  S:    Maintained
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
@@@ -6183,7 -6132,6 +6183,7 @@@ L:      [email protected] (mode
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/driver-api/dma-buf.rst
 +F:    Documentation/userspace-api/dma-buf-alloc-exchange.rst
  F:    drivers/dma-buf/
  F:    include/linux/*fence.h
  F:    include/linux/dma-buf.h
@@@ -6386,17 -6334,6 +6386,17 @@@ F:    Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
 +DPLL SUBSYSTEM
 +M:    Vadim Fedorenko <[email protected]>
 +M:    Arkadiusz Kubalewski <[email protected]>
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/driver-api/dpll.rst
 +F:    drivers/dpll/*
 +F:    include/linux/dpll.h
 +F:    include/uapi/linux/dpll.h
 +
  DRBD DRIVER
  M:    Philipp Reisner <[email protected]>
  M:    Lars Ellenberg <[email protected]>
@@@ -6676,7 -6613,6 +6676,7 @@@ S:      Maintaine
  B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
 +F:    drivers/gpu/drm/ci/xfails/msm*
  F:    drivers/gpu/drm/msm/
  F:    include/uapi/drm/msm_drm.h
  
@@@ -6812,7 -6748,7 +6812,7 @@@ F:      drivers/gpu/drm/panel/panel-sitronix
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 -R:    Ondrej Jirman <meg[email protected]>
 +R:    Ondrej Jirman <meg[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@@ -6828,8 -6764,7 +6828,8 @@@ DRM DRIVER FOR SOLOMON SSD130X OLED DIS
  M:    Javier Martinez Canillas <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd-common.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd13*.yaml
  F:    drivers/gpu/drm/solomon/ssd130x*
  
  DRM DRIVER FOR ST-ERICSSON MCDE
@@@ -6924,26 -6859,12 +6924,26 @@@ M:   Thomas Zimmermann <tzimmermann@suse.
  S:    Maintained
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/
 +F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/*
 +F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 -F:    include/drm/drm*
 +F:    include/drm/drm
  F:    include/linux/vga*
 -F:    include/uapi/drm/drm*
 +F:    include/uapi/drm/
 +X:    drivers/gpu/drm/amd/
 +X:    drivers/gpu/drm/armada/
 +X:    drivers/gpu/drm/etnaviv/
 +X:    drivers/gpu/drm/exynos/
 +X:    drivers/gpu/drm/i915/
 +X:    drivers/gpu/drm/kmb/
 +X:    drivers/gpu/drm/mediatek/
 +X:    drivers/gpu/drm/msm/
 +X:    drivers/gpu/drm/nouveau/
 +X:    drivers/gpu/drm/radeon/
 +X:    drivers/gpu/drm/renesas/
 +X:    drivers/gpu/drm/tegra/
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <[email protected]>
@@@ -6964,7 -6885,6 +6964,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
  F:    Documentation/gpu/meson.rst
 +F:    drivers/gpu/drm/ci/xfails/meson*
  F:    drivers/gpu/drm/meson/
  
  DRM DRIVERS FOR ATMEL HLCDC
@@@ -6988,9 -6908,7 +6988,9 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
  F:    drivers/gpu/drm/drm_bridge.c
 +F:    drivers/gpu/drm/drm_bridge_connector.c
  F:    include/drm/drm_bridge.h
 +F:    include/drm/drm_bridge_connector.h
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -7014,12 -6932,10 +7014,12 @@@ F:   Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    drivers/gpu/drm/fsl-dcu/
  
 -DRM DRIVERS FOR FREESCALE IMX
 +DRM DRIVERS FOR FREESCALE IMX 5/6
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +T:    git git://git.pengutronix.de/git/pza/linux
  F:    Documentation/devicetree/bindings/display/imx/
  F:    drivers/gpu/drm/imx/ipuv3/
  F:    drivers/gpu/ipu-v3/
@@@ -7038,7 -6954,7 +7038,7 @@@ DRM DRIVERS FOR GMA500 (Poulsbo, Moores
  M:    Patrik Jakobsson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://github.com/patjak/drm-gma500
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/gma500/
  
  DRM DRIVERS FOR HISILICON
@@@ -7077,7 -6993,6 +7077,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
 +F:    drivers/gpu/drm/ci/xfails/mediatek*
  F:    drivers/gpu/drm/mediatek/
  F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
@@@ -7118,7 -7033,6 +7118,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/rockchip/
 +F:    drivers/gpu/drm/ci/xfails/rockchip*
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
@@@ -7215,7 -7129,7 +7215,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM GPU SCHEDULER
 -M:    Luben Tuikov <luben.tuikov@amd.com>
 +M:    Luben Tuikov <ltuikov89@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7224,7 -7138,6 +7224,7 @@@ F:      include/drm/gpu_scheduler.
  
  DRM PANEL DRIVERS
  M:    Neil Armstrong <[email protected]>
 +R:    Jessica Zhang <[email protected]>
  R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -8180,7 -8093,7 +8180,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 -M:    Russ Weight <russ[email protected]>
 +M:    Russ Weight <russ[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -8702,8 -8615,6 +8702,8 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
 +F:    include/linux/stackleak.h
 +F:    kernel/stackleak.c
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
  
@@@ -8819,13 -8730,6 +8819,13 @@@ S:    Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
  F:    drivers/pmdomain/
  
 +GENERIC RADIX TREE
 +M:    Kent Overstreet <[email protected]>
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/generic-radix-tree.h
 +F:    lib/generic-radix-tree.c
 +
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
@@@ -9162,7 -9066,6 +9162,7 @@@ T:      git https://git.kernel.org/pub/scm/l
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
  F:    drivers/accel/habanalabs/
 +F:    include/linux/habanalabs/
  F:    include/trace/events/habanalabs.h
  F:    include/uapi/drm/habanalabs_accel.h
  
@@@ -9628,8 -9531,10 +9628,8 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/pressure/mprls0025pa.c
  
  HOST AP DRIVER
 -M:    Jouni Malinen <[email protected]>
  L:    [email protected]
  S:    Obsolete
 -W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
  HP BIOSCFG DRIVER
@@@ -10029,6 -9934,12 +10029,6 @@@ F:   Documentation/driver-api/i3
  F:    drivers/i3c/
  F:    include/linux/i3c/
  
 -IA64 (Itanium) PLATFORM
 -L:    [email protected]
 -S:    Orphan
 -F:    Documentation/arch/ia64/
 -F:    arch/ia64/
 -
  IBM Operation Panel Input Driver
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -10524,6 -10435,7 +10524,6 @@@ F:   drivers/platform/x86/intel/atomisp2/
  
  INTEL BIOS SAR INT1092 DRIVER
  M:    Shravan Sudhakar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel/int1092/
@@@ -10563,7 -10475,6 +10563,7 @@@ C:   irc://irc.oftc.net/intel-gf
  T:    git git://anongit.freedesktop.org/drm-intel
  F:    Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
  F:    Documentation/gpu/i915.rst
 +F:    drivers/gpu/drm/ci/xfails/i915*
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
  F:    include/uapi/drm/i915_drm.h
@@@ -10711,6 -10622,22 +10711,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 -F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 -F:    include/linux/soc/ixp4xx/npe.h
 -F:    include/linux/soc/ixp4xx/qmgr.h
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 -
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <[email protected]>
  M:    Edmund Dea <[email protected]>
@@@ -10774,7 -10701,7 +10774,7 @@@ F:   drivers/mfd/intel-m10-bmc
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MAX10 BMC SECURE UPDATES
 -M:    Russ Weight <russell.h.weight@intel.com>
 +M:    Peter Colberg <peter.colberg@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
@@@ -10954,6 -10881,7 +10954,6 @@@ F:   drivers/platform/x86/intel/wmi/thund
  
  INTEL WWAN IOSM DRIVER
  M:    M Chetan Kumar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wwan/iosm/
@@@ -11135,7 -11063,7 +11135,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/sma*
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/core-api/irq/irq-domain.rst
@@@ -11154,6 -11082,7 +11154,6 @@@ F:   lib/group_cpus.
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
 -M:    Marc Zyngier <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -11464,20 -11393,16 +11464,20 @@@ F:        usr
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <[email protected]>
 +R:    Gustavo A. R. Silva <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/ABI/testing/sysfs-kernel-oops_count
  F:    Documentation/ABI/testing/sysfs-kernel-warn_count
 +F:    arch/*/configs/hardening.config
  F:    include/linux/overflow.h
  F:    include/linux/randomize_kstack.h
 +F:    kernel/configs/hardening.config
  F:    mm/usercopy.c
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
 +K:    \b__counted_by\b
  
  KERNEL JANITORS
  L:    [email protected]
@@@ -12527,14 -12452,6 +12527,14 @@@ F: drivers/hwmon/ltc2947-i2c.
  F:    drivers/hwmon/ltc2947-spi.c
  F:    drivers/hwmon/ltc2947.h
  
 +LTC2991 HARDWARE MONITOR DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml
 +F:    drivers/hwmon/ltc2991.c
 +
  LTC2983 IIO TEMPERATURE DRIVER
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
@@@ -13586,6 -13503,7 +13586,6 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK T7XX 5G WWAN MODEM DRIVER
  M:    Chandrashekar Devegowda <[email protected]>
 -M:    Intel Corporation <[email protected]>
  R:    Chiranjeevi Rapolu <[email protected]>
  R:    Liu Haijun <[email protected]>
  R:    M Chetan Kumar <[email protected]>
@@@ -13606,7 -13524,7 +13606,7 @@@ F:   drivers/usb/mtu3
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
 -M:    Martin Donnelly <martin.donnell[email protected]>
 +M:    Ian Ray <ian.ra[email protected]>
  M:    Martyn Welch <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
@@@ -13929,10 -13847,9 +13929,10 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
 -M:    Vladimir Vid <vladimir.vid@sartura.hr>
 +M:    Robert Marko <robert.marko@sartura.hr>
  S:    Maintained
 -F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14111,7 -14028,7 +14111,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/adc/mcp3911.c
  
  MICROCHIP MMC/SD/SDIO MCI DRIVER
 -M:    Ludovic Desroches <ludovic.desroche[email protected]>
 +M:    Aubin Constans <aubin.constan[email protected]>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
@@@ -14430,11 -14347,9 +14430,11 @@@ MIPS/LOONGSON1 ARCHITECTUR
  M:    Keguang Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/*/loongson,ls1*.yaml
  F:    arch/mips/include/asm/mach-loongson32/
  F:    arch/mips/loongson32/
  F:    drivers/*/*loongson1*
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
  
  MIPS/LOONGSON2EF ARCHITECTURE
  M:    Jiaxun Yang <[email protected]>
@@@ -14462,11 -14377,6 +14462,11 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/radio/radio-miropcm20*
  
 +MITSUMI MM8013 FG DRIVER
 +M:    Konrad Dybcio <[email protected]>
 +F:    Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml
 +F:    drivers/power/supply/mm8013.c
 +
  MMP SUPPORT
  R:    Lubomir Rintel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -15037,7 -14947,7 +15037,7 @@@ K:   macse
  K:    \bmdo_
  
  NETWORKING [MPTCP]
 -M:    Matthieu Baerts <matt[email protected]>
 +M:    Matthieu Baerts <matt[email protected]>
  M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15046,11 -14956,10 +15046,11 @@@ W:        https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
 +F:    Documentation/netlink/specs/mptcp.yaml
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
 -F:    include/uapi/linux/mptcp.h
 +F:    include/uapi/linux/mptcp*.h
  F:    net/mptcp/
  F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
@@@ -15223,7 -15132,7 +15223,7 @@@ NOLIBC HEADER FIL
  M:    Willy Tarreau <[email protected]>
  M:    Thomas Weißschuh <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
@@@ -15443,7 -15352,6 +15443,7 @@@ M:   Laurentiu Palcu <laurentiu.palcu@oss
  R:    Lucas Stach <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
@@@ -15553,6 -15461,13 +15553,13 @@@ F: include/linux/objagg.
  F:    lib/objagg.c
  F:    lib/test_objagg.c
  
+ OBJPOOL
+ M:    Matt Wu <[email protected]>
+ S:    Supported
+ F:    include/linux/objpool.h
+ F:    lib/objpool.c
+ F:    lib/test_objpool.c
+ 
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -16064,7 -15979,6 +16071,7 @@@ F:   Documentation/ABI/testing/sysfs-firm
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +F:    tools/testing/selftests/dt/
  K:    of_overlay_notifier_
  K:    of_overlay_fdt_apply
  K:    of_overlay_remove
@@@ -16363,6 -16277,11 +16370,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCDP - PRIMARY CONSOLE AND DEBUG PORT
 -M:    Khalid Aziz <[email protected]>
 -S:    Maintained
 -F:    drivers/firmware/pcdp.*
 -
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <[email protected]>
  M:    Pali Rohár <[email protected]>
@@@ -17690,7 -17609,6 +17697,7 @@@ M:   Kalle Valo <[email protected]
  M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
 +W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
  
@@@ -17890,18 -17808,6 +17897,18 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
 +QUALCOMM QSEECOM DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom.c
 +
 +QUALCOMM QSEECOM UEFISECAPP DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom_uefisecapp.c
 +
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <[email protected]>
  M:    Sean Tranchetti <[email protected]>
@@@ -17964,7 -17870,6 +17971,7 @@@ C:   irc://irc.oftc.net/radeo
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
 +F:    drivers/gpu/drm/ci/xfails/amd*
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
  F:    include/uapi/drm/radeon_drm.h
@@@ -18029,6 -17934,7 +18036,6 @@@ F:   arch/mips/boot/dts/ralink/mt7621
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
 -M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/ralink/rt2x00/
@@@ -18233,6 -18139,8 +18240,6 @@@ REALTEK WIRELESS DRIVER (rtlwifi family
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
@@@ -18760,6 -18668,7 +18767,6 @@@ F:   drivers/media/dvb-frontends/rtl2832_
  RTL8180 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -18767,12 -18676,14 +18774,12 @@@ M:        Hin-Tak Leung <[email protected]
  M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
@@@ -18805,10 -18716,9 +18812,10 @@@ R: Andreas Hindborg <a.hindborg@samsung
  R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://github.com/Rust-for-Linux/linux
 +W:    https://rust-for-linux.com
  B:    https://github.com/Rust-for-Linux/linux/issues
  C:    zulip://rust-for-linux.zulipchat.com
 +P:    https://rust-for-linux.com/contributing
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
  F:    rust/
@@@ -19343,8 -19253,7 +19350,8 @@@ F:   Documentation/devicetree/bindings/mm
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 -M:    Eugen Hristev <[email protected]>
 +M:    Aubin Constans <[email protected]>
 +R:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
@@@ -19501,7 -19410,6 +19508,7 @@@ F:   drivers/net/ethernet/sfc
  
  SFCTEMP HWMON DRIVER
  M:    Emil Renner Berthing <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
@@@ -20163,13 -20071,6 +20170,13 @@@ F: drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
 +SOPHGO DEVICETREES
 +M:    Chao Wei <[email protected]>
 +M:    Chen Wang <[email protected]>
 +S:    Maintained
 +F:    arch/riscv/boot/dts/sophgo/
 +F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
 +
  SOUND
  M:    Jaroslav Kysela <[email protected]>
  M:    Takashi Iwai <[email protected]>
@@@ -20596,7 -20497,6 +20603,7 @@@ F:   include/dt-bindings/clock/starfive?j
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  M:    Jianlong Huang <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
@@@ -20620,10 -20520,9 +20627,10 @@@ F: drivers/usb/cdns3/cdns3-starfive.
  
  STARFIVE JH71XX PMU CONTROLLER DRIVER
  M:    Walker Chen <[email protected]>
 +M:    Changhuang Liang <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/pmdomain/starfive/jh71xx-pmu.c
 +F:    drivers/pmdomain/starfive/
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
@@@ -20631,6 -20530,7 +20638,6 @@@ M:   Conor Dooley <[email protected]
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
  F:    Documentation/devicetree/bindings/soc/starfive/
 -F:    drivers/soc/starfive/
  
  STARFIVE TRNG DRIVER
  M:    Jia Jie Ho <[email protected]>
@@@ -21011,7 -20911,6 +21018,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/pmdomain/arm/
  F:    drivers/powercap/arm_scmi_powercap.c
  F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
@@@ -21471,8 -21370,8 +21478,8 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 -R:    Amit Kucheria <[email protected]>
  R:    Zhang Rui <[email protected]>
 +R:    Lukasz Luba <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
@@@ -21766,6 -21665,7 +21773,6 @@@ L:   [email protected]
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
  F:    drivers/net/wireless/ti/
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
@@@ -21939,11 -21839,9 +21946,11 @@@ W: https://www.tq-group.com/en/products
  F:    arch/arm/boot/dts/imx*mba*.dts*
  F:    arch/arm/boot/dts/imx*tqma*.dts*
  F:    arch/arm/boot/dts/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*mba*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*tqma*.dts*
  F:    arch/arm64/boot/dts/freescale/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/tqml*.dts*
  F:    drivers/gpio/gpio-tqmx86.c
  F:    drivers/mfd/tqmx86.c
  F:    drivers/watchdog/tqmx86_wdt.c
@@@ -22956,7 -22854,6 +22963,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/ci/xfails/virtio*
  F:    drivers/gpu/drm/virtio/
  F:    include/uapi/linux/virtio_gpu.h
  
@@@ -23150,7 -23047,7 +23157,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Deep Shah <sdeep@vmware.com>
 +M:    Jeff Sipek <jsipek@vmware.com>
  R:    Ajay Kaher <[email protected]>
  R:    Alexey Makhalov <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
@@@ -23797,11 -23694,6 +23804,11 @@@ F: Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
  
 +XILINX LL TEMAC ETHERNET DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/net/ethernet/xilinx/ll_temac*
 +
  XILINX PWM DRIVER
  M:    Sean Anderson <[email protected]>
  S:    Maintained
@@@ -23834,13 -23726,6 +23841,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX VERSAL EDAC DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +M:    Sai Krishna Potthuri <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
 +F:    drivers/edac/versal_edac.c
 +
  XILINX WATCHDOG DRIVER
  M:    Srinivas Neeli <[email protected]>
  R:    Shubhrajyoti Datta <[email protected]>

diff --combined kernel/trace/fprobe.c
index 881f90f0cbcfac92831e97bca869347d52b15e3e,6890f4fd17fc837a73656aa4f252a21c825552f5..6cd2a4e3afb8fb6045dbf27543a67147dea20900
--- 1/kernel/trace/fprobe.c
--- 2/kernel/trace/fprobe.c
+++ b/kernel/trace/fprobe.c
@@@ -187,9 -187,9 +187,9 @@@ static void fprobe_init(struct fprobe *
  
  static int fprobe_init_rethook(struct fprobe *fp, int num)
  {
-       int i, size;
+       int size;
  
 -      if (num < 0)
 +      if (num <= 0)
                return -EINVAL;
  
        if (!fp->exit_handler) {
@@@ -202,29 -202,21 +202,21 @@@
                size = fp->nr_maxactive;
        else
                size = num * num_possible_cpus() * 2;
 -      if (size < 0)
 -              return -E2BIG;
 +      if (size <= 0)
 +              return -EINVAL;
  
-       fp->rethook = rethook_alloc((void *)fp, fprobe_exit_handler);
-       if (!fp->rethook)
-               return -ENOMEM;
-       for (i = 0; i < size; i++) {
-               struct fprobe_rethook_node *node;
- 
-               node = kzalloc(sizeof(*node) + fp->entry_data_size, GFP_KERNEL);
-               if (!node) {
-                       rethook_free(fp->rethook);
-                       fp->rethook = NULL;
-                       return -ENOMEM;
-               }
-               rethook_add_node(fp->rethook, &node->node);
-       }
+       /* Initialize rethook */
+       fp->rethook = rethook_alloc((void *)fp, fprobe_exit_handler,
+                               sizeof(struct fprobe_rethook_node), size);
+       if (IS_ERR(fp->rethook))
+               return PTR_ERR(fp->rethook);
+ 
        return 0;
  }
  
  static void fprobe_fail_cleanup(struct fprobe *fp)
  {
-       if (fp->rethook) {
+       if (!IS_ERR_OR_NULL(fp->rethook)) {
                /* Don't need to cleanup rethook->handler because this is not used. */
                rethook_free(fp->rethook);
                fp->rethook = NULL;
@@@ -379,14 -371,14 +371,14 @@@ int unregister_fprobe(struct fprobe *fp
        if (!fprobe_is_registered(fp))
                return -EINVAL;
  
-       if (fp->rethook)
+       if (!IS_ERR_OR_NULL(fp->rethook))
                rethook_stop(fp->rethook);
  
        ret = unregister_ftrace_function(&fp->ops);
        if (ret < 0)
                return ret;
  
-       if (fp->rethook)
+       if (!IS_ERR_OR_NULL(fp->rethook))
                rethook_free(fp->rethook);
  
        ftrace_free_filter(&fp->ops);

diff --combined lib/Kconfig.debug
index 40b77c437a744d0e97e7e89c627aedc593ccdaa1,207702c5eb2958cfdbe6e932674a88ce13d2f15b..cc7d53d9dc0191c544b0e2a71d0a6500b854924c
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -759,7 -759,7 +759,7 @@@ config SHRINKER_DEBU
  
  config DEBUG_STACK_USAGE
        bool "Stack utilization instrumentation"
 -      depends on DEBUG_KERNEL && !IA64
 +      depends on DEBUG_KERNEL
        help
          Enables the display of the minimum amount of free stack which each
          task has ever had available in the sysrq-T and sysrq-P debug output.
@@@ -1720,15 -1720,6 +1720,15 @@@ config DEBUG_NOTIFIER
          This is a relatively cheap check but if you care about maximum
          performance, say N.
  
 +config DEBUG_CLOSURES
 +      bool "Debug closures (bcache async widgits)"
 +      depends on CLOSURES
 +      select DEBUG_FS
 +      help
 +        Keeps all active closures in a linked list and provides a debugfs
 +        interface to list them, which makes it possible to see asynchronous
 +        operations that get stuck.
 +
  config DEBUG_MAPLE_TREE
        bool "Debug maple trees"
        depends on DEBUG_KERNEL
@@@ -2954,6 -2945,17 +2954,17 @@@ config TEST_CLOCKSOURCE_WATCHDO
  
          If unsure, say N.
  
+ config TEST_OBJPOOL
+       tristate "Test module for correctness and stress of objpool"
+       default n
+       depends on m && DEBUG_KERNEL
+       help
+         This builds the "test_objpool" module that should be used for
+         correctness verification and concurrent testings of objects
+         allocation and reclamation.
+ 
+         If unsure, say N.
+ 
  endif # RUNTIME_TESTING_MENU
  
  config ARCH_USE_MEMTEST

diff --combined lib/Makefile
index 1b311c7fd32be7f7c3e85fea907db5b58aec64cc,cebfa4235bfe619cdc06ed5956cdc1144b84ffba..9e0972f7b76434ddb9476de10321f2303d4a181a
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -34,7 -34,7 +34,7 @@@ lib-y := ctype.o string.o vsprintf.o cm
         is_single_threaded.o plist.o decompress.o kobject_uevent.o \
         earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
         nmi_backtrace.o win_minmax.o memcat_p.o \
-        buildid.o
+        buildid.o objpool.o
  
  lib-$(CONFIG_PRINTK) += dump_stack.o
  lib-$(CONFIG_SMP) += cpumask.o
@@@ -45,7 -45,7 +45,7 @@@ obj-y += lockref.
  obj-y += bcd.o sort.o parser.o debug_locks.o random32.o \
         bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
         list_sort.o uuid.o iov_iter.o clz_ctz.o \
 -       bsearch.o find_bit.o llist.o memweight.o kfifo.o \
 +       bsearch.o find_bit.o llist.o lwq.o memweight.o kfifo.o \
         percpu-refcount.o rhashtable.o base64.o \
         once.o refcount.o rcuref.o usercopy.o errseq.o bucket_locks.o \
         generic-radix-tree.o
@@@ -107,6 -107,8 +107,8 @@@ obj-$(CONFIG_KPROBES_SANITY_TEST) += te
  obj-$(CONFIG_TEST_REF_TRACKER) += test_ref_tracker.o
  CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
  obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
+ obj-$(CONFIG_TEST_OBJPOOL) += test_objpool.o
+ 
  #
  # CFLAGS for compiling floating point code inside the kernel. x86/Makefile turns
  # off the generation of FPU/SSE* instructions for kernel proper but FPU_FLAGS
@@@ -255,8 -257,6 +257,8 @@@ obj-$(CONFIG_ATOMIC64_SELFTEST) += atom
  
  obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o
  
 +obj-$(CONFIG_CLOSURES) += closure.o
 +
  obj-$(CONFIG_DQL) += dynamic_queue_limits.o
  
  obj-$(CONFIG_GLOB) += glob.o