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 /testing/source/linux-6.1.x/slack-desc | |
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 'testing/source/linux-6.1.x/slack-desc')
11 files changed, 0 insertions, 209 deletions
diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic-smp.i686 b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic-smp.i686 deleted file mode 100644 index a6abc7703..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic-smp.i686 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-generic-smp: kernel-generic-smp (a general purpose SMP Linux kernel) -kernel-generic-smp: -kernel-generic-smp: This is a Linux kernel with built-in support for most disk -kernel-generic-smp: controllers. To use filesystems, or to load support for a SCSI or -kernel-generic-smp: other controller, then you'll need to load one or more kernel -kernel-generic-smp: modules using an initial ramdisk, or initrd. For more information -kernel-generic-smp: about creating an initrd, see the README.initrd file in the /boot -kernel-generic-smp: directory. -kernel-generic-smp: -kernel-generic-smp: SMP is "Symmetric multiprocessing", or multiple CPU/core support. -kernel-generic-smp: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic.i586 b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic.i586 deleted file mode 100644 index 1054d54ca..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic.i586 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-generic: kernel-generic (a general purpose single processor Linux kernel) -kernel-generic: -kernel-generic: A Linux kernel with built-in support for most disk controllers. -kernel-generic: For filesystem support, or if you need to load support for a SCSI or -kernel-generic: other controller, then you'll need to load one or more kernel modules -kernel-generic: using an initial ramdisk, or initrd. For more information about -kernel-generic: creating an initrd, see the README.initrd file in the /boot directory. -kernel-generic: -kernel-generic: -kernel-generic: -kernel-generic: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic.x86_64 b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic.x86_64 deleted file mode 100644 index b1410c979..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-generic.x86_64 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-generic: kernel-generic (a general purpose SMP Linux kernel) -kernel-generic: -kernel-generic: This is a Linux kernel with built-in support for most disk -kernel-generic: controllers. To use filesystems, or to load support for a SCSI or -kernel-generic: other controller, then you'll need to load one or more kernel -kernel-generic: modules using an initial ramdisk, or initrd. For more information -kernel-generic: about creating an initrd, see the README.initrd file in the /boot -kernel-generic: directory. -kernel-generic: -kernel-generic: SMP is "Symmetric multiprocessing", or multiple CPU/core support. -kernel-generic: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-headers b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-headers deleted file mode 100644 index 511d5fdc7..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-headers +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-headers: kernel-headers (Linux kernel include files) -kernel-headers: -kernel-headers: These are the include files from the Linux kernel. -kernel-headers: -kernel-headers: You'll need these to compile most system software for Linux. -kernel-headers: -kernel-headers: -kernel-headers: -kernel-headers: -kernel-headers: -kernel-headers: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge-smp.i686 b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge-smp.i686 deleted file mode 100644 index 0757cea35..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge-smp.i686 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-huge-smp: kernel-huge-smp (a fully-loaded SMP Linux kernel) -kernel-huge-smp: -kernel-huge-smp: This is a Linux kernel with built-in support for most disk -kernel-huge-smp: controllers. If you're looking for a more stripped down kernel -kernel-huge-smp: (this one contains everything but the kitchen sink ;-), then install -kernel-huge-smp: the kernel-generic-smp in the /boot directory along with an initrd to -kernel-huge-smp: load support for your boot device and filesystem. For instructions -kernel-huge-smp: on the initrd, see README.initrd in the /boot directory. -kernel-huge-smp: -kernel-huge-smp: SMP is "Symmetric multiprocessing", or multiple CPU/core support. -kernel-huge-smp: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge.i586 b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge.i586 deleted file mode 100644 index 1a5afb09a..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge.i586 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-huge: kernel-huge (a fully-loaded single processor Linux kernel) -kernel-huge: -kernel-huge: This is a Linux kernel with built-in support for most disk controllers -kernel-huge: and filesystems. If you're looking for a more stripped down kernel -kernel-huge: (this one contains everything but the kitchen sink ;-), then install -kernel-huge: the kernel-generic from the /boot directory along with an initrd to -kernel-huge: load support for your boot device and filesystem. For instructions -kernel-huge: on the initrd, see README.initrd in the /boot directory. -kernel-huge: -kernel-huge: -kernel-huge: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge.x86_64 b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge.x86_64 deleted file mode 100644 index c15947b1d..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-huge.x86_64 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-huge: kernel-huge (a fully-loaded SMP Linux kernel) -kernel-huge: -kernel-huge: This is a Linux kernel with built-in support for most disk -kernel-huge: controllers. If you're looking for a more stripped down kernel -kernel-huge: (this one contains everything but the kitchen sink ;-), then install -kernel-huge: the kernel-generic in the /boot directory along with an initrd to -kernel-huge: load support for your boot device and filesystem. For instructions -kernel-huge: on the initrd, see README.initrd in the /boot directory. -kernel-huge: -kernel-huge: SMP is "Symmetric multiprocessing", or multiple CPU/core support. -kernel-huge: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-modules-template b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-modules-template deleted file mode 100644 index 1338eb2ca..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-modules-template +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -%PACKAGE_NAME%: %PACKAGE_NAME% (Linux kernel modules) -%PACKAGE_NAME%: -%PACKAGE_NAME%: Kernel modules are pieces of code that can be loaded and unloaded into -%PACKAGE_NAME%: the kernel upon demand. They extend the functionality of the kernel -%PACKAGE_NAME%: without the need to reboot the system. These modules provide support -%PACKAGE_NAME%: for hardware such as USB devices, RAID controllers, network -%PACKAGE_NAME%: interfaces, and display devices, or add other additional capabilities -%PACKAGE_NAME%: to the kernel. -%PACKAGE_NAME%: -%PACKAGE_NAME%: -%PACKAGE_NAME%: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-source b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-source deleted file mode 100644 index cf254e748..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-source +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-source: kernel-source (Linux kernel source) -kernel-source: -kernel-source: Source code for Linus Torvalds' Linux kernel. -kernel-source: -kernel-source: This is the complete and unmodified source code for the Linux kernel. -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-source.vanilla b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-source.vanilla deleted file mode 100644 index cf254e748..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-source.vanilla +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-source: kernel-source (Linux kernel source) -kernel-source: -kernel-source: Source code for Linus Torvalds' Linux kernel. -kernel-source: -kernel-source: This is the complete and unmodified source code for the Linux kernel. -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: diff --git a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-template b/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-template deleted file mode 100644 index a2880bb2f..000000000 --- a/testing/source/linux-6.1.x/slack-desc/slack-desc.kernel-template +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -%PACKAGE_NAME%: %PACKAGE_NAME% (a Linux kernel) -%PACKAGE_NAME%: -%PACKAGE_NAME%: This is a Linux kernel with built-in support for most disk -%PACKAGE_NAME%: controllers. To use filesystems, or to load support for a SCSI or -%PACKAGE_NAME%: other controller, then you'll need to load one or more kernel -%PACKAGE_NAME%: modules using an initial ramdisk, or initrd. For more information -%PACKAGE_NAME%: about creating an initrd, see the README.initrd file in the /boot -%PACKAGE_NAME%: directory. -%PACKAGE_NAME%: -%PACKAGE_NAME%: -%PACKAGE_NAME%: |