diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-01-07 20:30:44 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-01-07 22:37:31 +0100 |
| commit | e0eaf6e451b08cc5af9d17258f2c6157cb424efe (patch) | |
| tree | 7b19d7e800954fc6c0bdc2b61e49771fd137c7c3 /recompress.sh | |
| parent | 34e6259d47376c3e767368d52f9aa20eafa49951 (diff) | |
| download | current-e0eaf6e451b08cc5af9d17258f2c6157cb424efe.tar.gz current-e0eaf6e451b08cc5af9d17258f2c6157cb424efe.tar.xz | |
Sat Jan 7 20:30:44 UTC 202320230107203044
We're going to go ahead and jump to the 6.1.4 kernel, in spite of the fact
that a kernel bisect identified the patch that was preventing 32-bit from
booting here on a Thinkpad X1E:
------
From 2e479b3b82c49bfb9422274c0a9c155a41caecb7 Mon Sep 17 00:00:00 2001
From: Michael Kelley <mikelley@microsoft.com>
Date: Wed, 16 Nov 2022 10:41:24 -0800
Subject: [PATCH] x86/ioremap: Fix page aligned size calculation in
__ioremap_caller()
commit 4dbd6a3e90e03130973688fd79e19425f720d999 upstream.
Current code re-calculates the size after aligning the starting and
ending physical addresses on a page boundary. But the re-calculation
also embeds the masking of high order bits that exceed the size of
the physical address space (via PHYSICAL_PAGE_MASK). If the masking
removes any high order bits, the size calculation results in a huge
value that is likely to immediately fail.
Fix this by re-calculating the page-aligned size first. Then mask any
high order bits using PHYSICAL_PAGE_MASK.
Fixes: ffa71f33a820 ("x86, ioremap: Fix incorrect physical address handling in
PAE mode")
------
The non-SMP non-PAE 32-bit kernel is fine even without the patch revert.
The PAE kernel also works fine with this patch reverted without any need
to revert ffa71f33a820 (the patch that this one is supposed to fix). The
machine's excessive (for 32-bit) amount of physical RAM (64GB) might also
be a factor here considering the PAE kernel works on all the other machines
around here without reverting this patch.
The patch is reverted only on 32-bit. Upstream report still pending.
Enjoy! :-)
a/kernel-generic-6.1.4-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.4-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.4-x86_64-1.txz: Upgraded.
a/tree-2.1.0-x86_64-1.txz: Upgraded.
d/kernel-headers-6.1.4-x86-1.txz: Upgraded.
k/kernel-source-6.1.4-noarch-1.txz: Upgraded.
l/gvfs-1.50.3-x86_64-1.txz: Upgraded.
l/hunspell-1.7.2-x86_64-1.txz: Upgraded.
l/libnice-0.1.21-x86_64-1.txz: Upgraded.
n/tin-2.6.2-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'recompress.sh')
| -rwxr-xr-x | recompress.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recompress.sh b/recompress.sh index 3f96f4686..686771c2e 100755 --- a/recompress.sh +++ b/recompress.sh @@ -397,6 +397,7 @@ gzip ./source/y/bsd-games/patches/0015-primes-Update-to-NetBSD-CVS-2018-02-03.pa gzip ./source/y/bsd-games/patches/0011-Fix-format-security-compiling-errors.patch gzip ./source/y/bsd-games/patches/0012-Fix-include-stdio.h-C-incompatibility.patch gzip ./source/y/bsd-games/patches/bsd-games.pom.diff +gzip ./source/k/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch gzip ./source/n/rdist/rdist-6.1.5-14.fix-msgsndnotify-loop.diff gzip ./source/n/rdist/rdist-6.1.5-11.mkstemp.diff gzip ./source/n/rdist/rdist-6.1.5-01.links.diff @@ -1159,7 +1160,6 @@ gzip ./source/x/ibus/emoji-test.txt gzip ./source/x/xcm/xcm.udev.rules.diff gzip ./source/x/libva/doinst.sh gzip ./testing/source/rust/link_libffi.diff -gzip ./testing/source/linux-6.1.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch gzip ./pasture/source/php/php-fpm.conf.diff gzip ./pasture/source/php/doinst.sh gzip ./pasture/source/php/PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch |