From f47e41d214fffd825e7355540f115832d53ed46e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Thu, 7 Apr 2011 01:52:47 +0000
Subject: [PATCH] [i386] Rename '686-bigmem' flavour to '686-pae'; remove '686'
 flavour.

For 686-class systems without PAE, the '486' flavour is more efficient
than the '686' flavour due to optimisation for uniprocessor systems.

svn path=/dists/trunk/linux-2.6/; revision=17210
---
 debian/changelog                              |  5 ++
 debian/config/defines                         |  2 +
 debian/config/i386/defines                    | 33 ++++++-------
 debian/config/i386/none/config.686            | 48 -------------------
 .../{config.686-bigmem => config.686-pae}     |  0
 5 files changed, 22 insertions(+), 66 deletions(-)
 delete mode 100644 debian/config/i386/none/config.686
 rename debian/config/i386/none/{config.686-bigmem => config.686-pae} (100%)

diff --git a/debian/changelog b/debian/changelog
index d7e7d4226..62943671a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ linux-2.6 (2.6.39~rc2-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
+  * [i386] Rename '686-bigmem' flavour to '686-pae'; remove '686' flavour.
+    For 686-class systems without PAE, the '486' flavour is more efficient
+    than the '686' flavour due to optimisation for uniprocessor systems.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 06 Apr 2011 14:02:37 +0100
 
 linux-2.6 (2.6.38-3) unstable; urgency=low
diff --git a/debian/config/defines b/debian/config/defines
index 5a839cd34..2824d1ac0 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -23,6 +23,8 @@ featuresets:
  none
 
 [description]
+part-long-up: This kernel is not suitable for SMP (multi-processor,
+ multi-core or hyper-threaded) systems.
 part-long-xen: This kernel also runs on a Xen hypervisor.
  It supports only unprivileged (domU) operation.
 
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index da4479317..3bca02389 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,44 +1,41 @@
 [base]
 flavours:
  486
- 686
- 686-bigmem
+ 686-pae
  amd64
 kernel-arch: x86
 
+[description]
+part-long-pae: This kernel requires PAE (Physical Address Extension).
+ This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
+ Celeron, Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
+ Turion or Phenom; Transmeta Efficeon; and VIA C7.
+
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
  kernelarch-x86/config
 
 [486_description]
-hardware: old PCs
-hardware-long: PCs with a 486, Pentium or compatible processor
+hardware: older PCs
+hardware-long: PCs with a single processor not supporting PAE
+parts: up
 
 [486_image]
 configs:
  kernelarch-x86/config-arch-32
 
-[686_description]
+[686-pae_description]
 hardware: modern PCs
-hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD Geode LX/NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
+hardware-long: PCs with one or more processors supporting PAE
+parts: pae xen
 
-[686_image]
+[686-pae_image]
 configs:
  kernelarch-x86/config-arch-32
 recommends: libc6-i686
 
-[686-bigmem_description]
-hardware: PCs with 4GB+ RAM
-hardware-long: PCs with 4-64GB RAM, using PAE (Physical Address Extension)
-parts: xen
-
-[686-bigmem_image]
-configs:
- kernelarch-x86/config-arch-32
-recommends: libc6-i686
-
-[686-bigmem_image-dbg]
+[686-pae_image-dbg]
 enabled: true
 
 [amd64_description]
diff --git a/debian/config/i386/none/config.686 b/debian/config/i386/none/config.686
deleted file mode 100644
index 3d3a75007..000000000
--- a/debian/config/i386/none/config.686
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-## file: arch/x86/Kconfig
-##
-# CONFIG_MATH_EMULATION is not set
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-
-##
-## file: arch/x86/Kconfig.cpu
-##
-## choice: Processor family
-# CONFIG_M486 is not set
-CONFIG_M686=y
-## end choice
-
-##
-## file: drivers/char/Kconfig
-##
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_RIO is not set
-
-##
-## file: drivers/i2c/busses/Kconfig
-##
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_STUB=m
-
-##
-## file: drivers/net/Kconfig
-##
-# CONFIG_NI5010 is not set
-
-##
-## file: drivers/net/hamradio/Kconfig
-##
-# CONFIG_DMASCC is not set
-
-##
-## file: drivers/pci/hotplug/Kconfig
-##
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-
-##
-## file: lib/Kconfig.debug
-##
-# CONFIG_DEBUG_HIGHMEM is not set
-
diff --git a/debian/config/i386/none/config.686-bigmem b/debian/config/i386/none/config.686-pae
similarity index 100%
rename from debian/config/i386/none/config.686-bigmem
rename to debian/config/i386/none/config.686-pae