Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision 1d671502bb9ab3b00e7a23f461532b1c081000a7)
+++ BOOK/bootable/mips/kernel.xml	(revision f23b5ee77821c2c0651aaaa9232ffbc8ab86d3d3)
@@ -15,176 +15,124 @@
   </indexterm>
 
-  <sect2 role="package"><title/>
-    <para>The Linux package contains the Linux kernel.</para>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/kernel.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 
-    <para os="a">Building the kernel involves a few steps&mdash;configuration,
-    compilation, and installation. Read the <filename>README</filename>
-    file in the kernel source tree for alternative methods to the way this
-    book configures the kernel.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
 
-    <para os="b">Prepare for compilation by running the following command:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>make mrproper</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='c'])"/>
 
-    <para os="d">This ensures that the kernel tree is absolutely clean. The
-    kernel team recommends that this command be issued prior to each
-    kernel compilation. Do not rely on the source tree being clean after
-    un-tarring.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
 
-    <para os="h">Configure the kernel via a menu-driven interface.
-    Please note that the udev bootscript requires "rtc" and "tmpfs" to be
-    enabled and built into the kernel, not as modules. BLFS has
-    some information regarding particular kernel configuration requirements of
-    packages outside of CLFS at <ulink
-    url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="i"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="f"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="j"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
-    <para os="j">Alternatively, <command>make oldconfig</command> may be more
-    appropriate in some situations. See the <filename>README</filename>
-    file for more information.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="k">If desired, skip kernel configuration by copying the kernel
-    config file, <filename>.config</filename>, from the host system
-    (assuming it is available) to the root directory of the unpacked kernel
-    sources. However, we do not recommend this option. It is often better
-    to explore all the configuration menus and create the kernel configuration
-    from scratch.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='h'])"/>
 
-    <para os="m">Compile the kernel image and modules:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="n"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
+<screen os="j"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
-    <para os="o">If using kernel modules, an
-    <filename>/etc/modprobe.conf</filename> file may be needed.
-    Information pertaining to modules and kernel configuration is
-    located in the kernel documentation in the <filename
-    class="directory">Documentation</filename> directory of the kernel
-    sources tree. Also, <filename>modprobe.conf(5)</filename> may
-    be of interest.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='k'])"/>
 
-    <para os="p">Be very careful when reading other documentation relating to
-    kernel modules because it usually applies to 2.4.x kernels only. As
-    far as we know, kernel configuration issues specific to Hotplug and
-    Udev are not documented. The problem is that Udev will create a device
-    node only if Hotplug or a user-written script inserts the corresponding
-    module into the kernel, and not all modules are detectable by Hotplug.
-    Note that statements like the one below in the
-    <filename>/etc/modprobe.conf</filename> file do not work with Udev:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='l'])"/>
 
-<screen os="q"><literal>alias char-major-XXX some-module</literal></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='m'])"/>
 
-    <para os="r">Because of the complications with Udev and modules,
-    we strongly recommend starting with a completely non-modular kernel
-    configuration, especially if this is the first time using Udev.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='n'])"/>
 
-    <para os="s">Install the modules, if the kernel configuration uses
-    them:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='o'])"/>
 
-<screen os="t"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+<screen os="p"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
     INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
-    <para os="u">After kernel compilation is complete, additional steps are
-    required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='q'])"/>
 
-    <para os="v">Issue the following command to install the kernel:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='r'])"/>
 
-<screen><userinput>cp vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='s'])"/>
 
-    <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
-    It maps the function entry points of every function in the kernel API,
-    as well as the addresses of the kernel data structures for the running
-    kernel. Issue the following command to install the map file:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='t'])"/>
 
-<screen os="w1"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='t'])"/>
 
-    <para os="x">The kernel configuration file <filename>.config</filename>
-    produced by the <command>make menuconfig</command> step above contains
-    all the configuration selections for the kernel that was just compiled.
-    It is a good idea to keep this file for future reference:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='t'])"/>
 
-<screen os="y"><userinput>cp .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='u'])"/>
 
-    <warning os="z">
-      <para>Some kernel documentation recommends creating a symlink from
-      <filename class="symlink">/usr/src/linux</filename> pointing to the
-      kernel source directory. This is specific to kernels prior to the
-      2.6 series and <emphasis>must not</emphasis> be created on an CLFS
-      system as it can cause problems for packages you may wish to build
-      once your base CLFS system is complete.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='v'])"/>
 
-      <para>Also, the headers in the system's <filename
-      class="directory">include</filename> directory should
-      <emphasis>always</emphasis> be the ones against which Glibc was
-      compiled (from the Linux-Headers package) and should
-      <emphasis>never</emphasis> be replaced by the kernel headers.</para>
-    </warning>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='w'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='x'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='y'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86/kernel.xml"
+   xpointer="xpointer(//*[@os='z'])"/>
 
   </sect2>
 
-  <sect2 id="contents-kernel" role="content">
-    <title>Contents of Linux</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>config-[linux-version], clfskernel-[linux-version],
-        and System.map-[linux-version]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="config">
-        <term><filename>config-[linux-version]</filename></term>
-        <listitem>
-          <para>Contains all the configuration selections for the kernel</para>
-          <indexterm zone="ch-bootable-kernel config">
-            <primary sortas="e-/boot/config">/boot/config-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clfskernel">
-        <term><filename>clfskernel-[linux-version]</filename></term>
-        <listitem>
-          <para>The engine of the Linux system. When turning on the
-          computer, the kernel is the first part of the operating system
-          that gets loaded. It detects and initializes all components of
-          the computer's hardware, then makes these components available
-          as a tree of files to the software and turns a single CPU into
-          a multitasking machine capable of running scores of programs
-          seemingly at the same time.</para>
-          <indexterm zone="ch-bootable-kernel clfskernel">
-            <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="System.map">
-        <term><filename>System.map-[linux-version]</filename></term>
-        <listitem>
-          <para>A list of addresses and symbols; it maps the entry points
-          and addresses of all the functions and data structures in the
-          kernel</para>
-          <indexterm zone="ch-bootable-kernel System.map">
-            <primary sortas="e-/boot/System.map">/boot/System.map-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/kernel.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 
 </sect1>
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 1d671502bb9ab3b00e7a23f461532b1c081000a7)
+++ BOOK/bootable/x86/kernel.xml	(revision f23b5ee77821c2c0651aaaa9232ffbc8ab86d3d3)
@@ -37,5 +37,5 @@
     un-tarring.</para>
 
-    <para os="h">Configure the kernel via a menu-driven interface.
+    <para os="e">Configure the kernel via a menu-driven interface.
     Please note that the udev bootscript requires "rtc" and "tmpfs" to be
     enabled and built into the kernel, not as modules. BLFS has
@@ -44,11 +44,11 @@
     url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
 
-<screen os="i"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="f"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
-    <para os="j">Alternatively, <command>make oldconfig</command> may be more
+    <para os="g">Alternatively, <command>make oldconfig</command> may be more
     appropriate in some situations. See the <filename>README</filename>
     file for more information.</para>
 
-    <para os="k">If desired, skip kernel configuration by copying the kernel
+    <para os="h">If desired, skip kernel configuration by copying the kernel
     config file, <filename>.config</filename>, from the host system
     (assuming it is available) to the root directory of the unpacked kernel
@@ -57,9 +57,9 @@
     from scratch.</para>
 
-    <para os="m">Compile the kernel image and modules:</para>
+    <para os="i">Compile the kernel image and modules:</para>
 
-<screen os="n"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
+<screen os="j"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
-    <para os="o">If using kernel modules, an
+    <para os="k">If using kernel modules, an
     <filename>/etc/modprobe.conf</filename> file may be needed.
     Information pertaining to modules and kernel configuration is
@@ -69,5 +69,5 @@
     be of interest.</para>
 
-    <para os="p">Be very careful when reading other documentation relating to
+    <para os="l">Be very careful when reading other documentation relating to
     kernel modules because it usually applies to 2.4.x kernels only. As
     far as we know, kernel configuration issues specific to Hotplug and
@@ -78,30 +78,36 @@
     <filename>/etc/modprobe.conf</filename> file do not work with Udev:</para>
 
-<screen os="q"><literal>alias char-major-XXX some-module</literal></screen>
+<screen os="m"><literal>alias char-major-XXX some-module</literal></screen>
 
-    <para os="r">Because of the complications with Udev and modules,
+    <para os="n">Because of the complications with Udev and modules,
     we strongly recommend starting with a completely non-modular kernel
     configuration, especially if this is the first time using Udev.</para>
 
-    <para os="s">Install the modules, if the kernel configuration uses
+    <para os="o">Install the modules, if the kernel configuration uses
     them:</para>
 
-<screen os="t"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
+<screen os="p"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
     INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
-    <para os="u">After kernel compilation is complete, additional steps are
+    <para os="q">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
     the <filename class="directory">${CLFS}/boot</filename> directory.</para>
 
-    <para os="v">Issue the following command to install the kernel:</para>
+    <para os="r">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen os="s"><userinput>cp vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
-    <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
+    <para os="t"><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
     as well as the addresses of the kernel data structures for the running
     kernel. Issue the following command to install the map file:</para>
 
-<screen os="w1"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="u"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
+
+    <para os="v">If we compiled our kernel with modules and we made sure depmod.pl
+    is avaiable from busybox, we need to create the module dependency list by
+    issuing the following command:</para>
+
+<screen os="w"><userinput>${CLFS}/cross-tools/bin/depmod.pl -F ${CLFS}/boot/System.map -b ${CLFS}/lib/modules/&linux-version;</userinput></screen>
 
     <para os="x">The kernel configuration file <filename>.config</filename>
