add 686-bigmem flavor

svn path=/dists/trunk/linux-2.6/; revision=6953

3 files changed, 88 insertions, 1 deletions

diff --git a/debian/arch/i386/config.686-bigmem b/debian/arch/i386/config.686-bigmem
new file mode 100644
index 000000000000..264189825bac
--- /dev/null
+++ b/debian/arch/i386/config.686-bigmem
@@ -0,0 +1,77 @@
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_IOSCHED="deadline"
+# CONFIG_M386 is not set
+CONFIG_M686=y
+# CONFIG_MK7 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_P4THERMAL=y
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+# CONFIG_HIGHPTE is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_IRQBALANCE=y
+CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+# CONFIG_SBPCD is not set
+# CONFIG_CM206 is not set
+# CONFIG_CDU31A is not set
+# CONFIG_DMASCC is not set
+# CONFIG_IRPORT_SIR is not set
+# CONFIG_NI5010 is not set
+# CONFIG_PCMCIA_XIRTULIP is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_HYSDN is not set
+# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
+# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_C4 is not set
+# CONFIG_COMPUTONE is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+# CONFIG_STALLION is not set
+# CONFIG_ISTALLION is not set
+# CONFIG_FTAPE is not set
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_STUB=m
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y
+# CONFIG_M486 is not set
diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines
index 799b7d2f1b6e..e00553f81e12 100644
--- a/debian/arch/i386/defines
+++ b/debian/arch/i386/defines
@@ -3,6 +3,7 @@ compiler: gcc-4.1
 flavours:
  486
  686
+ 686-bigmem
  k7
 kernel-arch: i386
 kernel-header-dirs: i386
@@ -22,6 +23,13 @@ longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
 [686_image]
 recommends: libc6-i686
 
+[686-bigmem]
+class: PPro/Celeron/PII/PIII/P4
+longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+
+[686-bigmem_image]
+recommends: libc6-i686
+
 [k7]
 class: AMD K7
 longclass: 32bit AMD Duron/Athlon/AthlonXP
diff --git a/debian/changelog b/debian/changelog
index 85127d12106b..d22611138b5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,11 +33,13 @@ linux-2.6 (2.6.17-3) UNRELEASED; urgency=low
   * Fix README.Debian: Correct svn location, remove old boot param bswap
     reference, the asfs patch is in the Debian kernel. Remove reference to
     AMD 768 erratum 10, it was solved in 2.6.12. Add wording corrections.
+  * Add 686-bigmem flavour with CONFIG_HIGHMEM64G=y and CONFIG_X86_PAE=y.
+    Set deadline as default iosched and CONFIG_NR_CPUS=32. (closes: 295680)
 
   [ Sven Luther ]
   * Re-enabled fs-asfs patch.
 
- -- Sven Luther <luther@debian.org>  Wed,  5 Jul 2006 23:25:30 +0200
+ -- maximilian attems <maks@sternwelten.at>  Fri,  7 Jul 2006 02:03:12 +0200
 
 linux-2.6 (2.6.17-2) unstable; urgency=low