Merge 5.15.73 into android14-5.15
Changes in 5.15.73 Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 docs: update mediator information in CoC docs xsk: Inherit need_wakeup flag for shared sockets mm: gup: fix the fast GUP race against THP collapse powerpc/64s/radix: don't need to broadcast IPI for radix pmd collapse flush fs: fix UAF/GPF bug in nilfs_mdt_destroy firmware: arm_scmi: Improve checks in the info_get operations firmware: arm_scmi: Harden accesses to the sensor domains firmware: arm_scmi: Add SCMI PM driver remove routine dmaengine: xilinx_dma: Fix devm_platform_ioremap_resource error handling dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer scsi: qedf: Fix a UAF bug in __qedf_probe() net/ieee802154: fix uninit value bug in dgram_sendmsg net: marvell: prestera: add support for for Aldrin2 ALSA: hda/hdmi: Fix the converter reuse for the silent stream um: Cleanup syscall_handler_t cast in syscalls_32.h um: Cleanup compiler warning in arch/x86/um/tls_32.c arch: um: Mark the stack non-executable to fix a binutils warning net: atlantic: fix potential memory leak in aq_ndev_close() drm/amd/display: Fix double cursor on non-video RGB MPO drm/amd/display: Assume an LTTPR is always present on fixed_vs links drm/amd/display: update gamut remap if plane has changed drm/amd/display: skip audio setup when audio stream is enabled mmc: core: Replace with already defined values for readability mmc: core: Terminate infinite loop in SD-UHS voltage switch perf parse-events: Identify broken modifiers mm/huge_memory: minor cleanup for split_huge_pages_all mm/huge_memory: use pfn_to_online_page() in split_huge_pages_all() wifi: cfg80211: fix MCS divisor value net/mlx5: Disable irq when locking lag_lock usb: mon: make mmapped memory read only USB: serial: ftdi_sio: fix 300 bps rate for SIO rpmsg: qcom: glink: replace strncpy() with strscpy_pad() Revert "clk: ti: Stop using legacy clkctrl names for omap4 and 5" Linux 5.15.73 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I3332f98a4ab57d0736e138839466a1b3c2347acf
This commit is contained in:
@@ -2880,14 +2880,15 @@ static void split_huge_pages_all(void)
|
||||
unsigned long total = 0, split = 0;
|
||||
|
||||
pr_debug("Split all THPs\n");
|
||||
for_each_populated_zone(zone) {
|
||||
for_each_zone(zone) {
|
||||
if (!managed_zone(zone))
|
||||
continue;
|
||||
max_zone_pfn = zone_end_pfn(zone);
|
||||
for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++) {
|
||||
if (!pfn_valid(pfn))
|
||||
continue;
|
||||
int nr_pages;
|
||||
|
||||
page = pfn_to_page(pfn);
|
||||
if (!get_page_unless_zero(page))
|
||||
page = pfn_to_online_page(pfn);
|
||||
if (!page || !get_page_unless_zero(page))
|
||||
continue;
|
||||
|
||||
if (zone != page_zone(page))
|
||||
@@ -2898,8 +2899,10 @@ static void split_huge_pages_all(void)
|
||||
|
||||
total++;
|
||||
lock_page(page);
|
||||
nr_pages = thp_nr_pages(page);
|
||||
if (!split_huge_page(page))
|
||||
split++;
|
||||
pfn += nr_pages - 1;
|
||||
unlock_page(page);
|
||||
next:
|
||||
put_page(page);
|
||||
|
||||
Reference in New Issue
Block a user