[lfs] branch trunk updated: kernel: Drop HIGHMEM64G and regenerate

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository lfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new 77533bafc kernel: Drop HIGHMEM64G and regenerate
77533bafc is described below

commit 77533bafc7b7100d0168f9d631351dcf9b4003bb
Author: Xi Ruoyao <[email protected]>
AuthorDate: Thu Aug 7 09:33:19 2025 +0800

    kernel: Drop HIGHMEM64G and regenerate
    
    The upstream kernel has dropped it because real 32-bit hardware almost
    never has RAM > 4 GiB.  The users running 32-bit software on 64-bit
    hardware should really switch to MLFS now.
    
    Regenerating the XML files also makes the prompt for X2APIC consistent
    with the 6.15 kernel.
---
 chapter10/kernel.xml            | 7 -------
 chapter10/kernel/highmem.toml   | 1 -
 chapter10/kernel/highmem.xml    | 8 --------
 chapter10/kernel/kernel.version | 2 +-
 chapter10/kernel/x2apic.xml     | 2 +-
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 327e3de60..0c4739167 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -151,13 +151,6 @@
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
         href="kernel/x2apic.xml"/>
 
-      <para>If you are building a 32-bit system running on a hardware
-      with RAM more than 4GB, adjust the configuration so the kernel will
-      be able to use up to 64GB physical RAM:</para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="kernel/highmem.xml"/>
-
       <para>If the partition for the LFS system is in a NVME SSD (i. e. the
       device node for the partition is <filename>/dev/nvme*</filename>
       instead of <filename>/dev/sd*</filename>), enable NVME support or
diff --git a/chapter10/kernel/highmem.toml b/chapter10/kernel/highmem.toml
deleted file mode 100644
index 2caf42385..000000000
--- a/chapter10/kernel/highmem.toml
+++ /dev/null
@@ -1 +0,0 @@
-HIGHMEM64G='X'
diff --git a/chapter10/kernel/highmem.xml b/chapter10/kernel/highmem.xml
deleted file mode 100644
index 4849fc248..000000000
--- a/chapter10/kernel/highmem.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
-  H<emphasis role='blue'>i</emphasis>gh Memory Support ---&gt;
-    (X) <emphasis role='blue'>6</emphasis>4GB                                                        [HIGHMEM64G]</screen>
diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index d7d9d3fbd..a42fb8ab1 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.13.1
+6.15.6
diff --git a/chapter10/kernel/x2apic.xml b/chapter10/kernel/x2apic.xml
index e52756879..a622059f8 100644
--- a/chapter10/kernel/x2apic.xml
+++ b/chapter10/kernel/x2apic.xml
@@ -4,7 +4,7 @@
 <!-- Automatically generated by kernel-config.py
      DO NOT EDIT! -->
 <screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
-  [*] <emphasis role='blue'>S</emphasis>upport x2apic                                                [X86_X2APIC]
+  [*] <emphasis role='blue'>x</emphasis>2APIC interrupt controller architecture support              [X86_X2APIC]
 
 <emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
   [*] <emphasis role='blue'>P</emphasis>CI support ---&gt;                                                     [PCI]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page