[kernel] r6507 - dists/trunk/linux-2.6/debian/arch/i386

Bastian Blank waldi at costa.debian.org
Sun Apr 30 16:01:53 UTC 2006 

Author: waldi
Date: Sun Apr 30 16:01:50 2006
New Revision: 6507

Removed:
   dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
   dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/i386/config.k7
   dists/trunk/linux-2.6/debian/arch/i386/defines
Log:
* debian/arch/i386/config: Upate.
* debian/arch/i386/config.686
  - Move from debian/arch/i386/config.686-smp.
  - Update.
* debian/arch/i386/config.k7
  - Move from debian/arch/i386/config.k7-smp.
  - Update.
* debian/arch/i386/defines: Remove -smp images.


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Sun Apr 30 16:01:50 2006
@@ -69,6 +69,7 @@
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
@@ -999,6 +1000,8 @@
 CONFIG_STALDRV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PNP=m
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
@@ -1319,6 +1322,7 @@
 # CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_PM3 is not set
 CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_VIRTUAL=m
@@ -1359,6 +1363,7 @@
 CONFIG_SND_MTPAV=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
+CONFIG_SND_ADLIB=m
 CONFIG_SND_AD1848_LIB=m
 CONFIG_SND_CS4231_LIB=m
 CONFIG_SND_AD1816A=m
@@ -1378,6 +1383,7 @@
 CONFIG_SND_OPTI92X_AD1848=m
 CONFIG_SND_OPTI92X_CS4231=m
 CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
 CONFIG_SND_SB8=m
 CONFIG_SND_SB16=m
 CONFIG_SND_SBAWE=m
@@ -1729,22 +1735,7 @@
 CONFIG_EFI_PARTITION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
-CONFIG_DEBUG_KERNEL=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_FRAME_POINTER is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_KPROBES is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686	Sun Apr 30 16:01:50 2006
@@ -1,3 +1,6 @@
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 CONFIG_M686=y
 # CONFIG_MK7 is not set
@@ -13,9 +16,10 @@
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
-# CONFIG_SMP is not set
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
 CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_NONFATAL=m
@@ -25,62 +29,44 @@
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
+# CONFIG_IRQBALANCE is not set
+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=y
-# CONFIG_MTD_XIP is not set
-CONFIG_SBPCD=m
-CONFIG_CM206=m
-CONFIG_CDU31A=m
-CONFIG_DMASCC=m
-CONFIG_IRPORT_SIR=m
-# CONFIG_DONGLE_OLD is not set
-CONFIG_NI5010=m
-CONFIG_PCMCIA_XIRTULIP=m
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_COMPUTONE=m
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_SX=m
-CONFIG_RIO=m
-CONFIG_RIO_OLDPCI=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_FTAPE=m
-CONFIG_ZFTAPE=m
-CONFIG_ZFT_DFLT_BLK_SZ=10240
-CONFIG_ZFT_COMPRESSOR=m
-CONFIG_FT_NR_BUFFERS=3
-CONFIG_FT_PROC_FS=y
-CONFIG_FT_NORMAL_DEBUG=y
-# CONFIG_FT_FULL_DEBUG is not set
-# CONFIG_FT_NO_TRACE is not set
-# CONFIG_FT_NO_TRACE_AT_ALL is not set
-CONFIG_FT_STD_FDC=y
-# CONFIG_FT_MACH2 is not set
-# CONFIG_FT_PROBE_FC10 is not set
-# CONFIG_FT_ALT_FDC is not set
-CONFIG_FT_FDC_THR=8
-CONFIG_FT_FDC_MAX_RATE=2000
-CONFIG_FT_ALPHA_CLOCK=0
-CONFIG_I2C_ELEKTOR=m
+# 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=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_FS_MBCACHE=m
-CONFIG_LOG_BUF_SHIFT=14
+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
-CONFIG_BROKEN_ON_SMP=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7	Sun Apr 30 16:01:50 2006
@@ -1,3 +1,6 @@
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 # CONFIG_M686 is not set
 CONFIG_MK7=y
@@ -14,9 +17,10 @@
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_USE_3DNOW=y
-# CONFIG_SMP is not set
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
 CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_NONFATAL=m
@@ -26,62 +30,44 @@
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
+# CONFIG_IRQBALANCE is not set
+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=y
-# CONFIG_MTD_XIP is not set
-CONFIG_SBPCD=m
-CONFIG_CM206=m
-CONFIG_CDU31A=m
-CONFIG_DMASCC=m
-CONFIG_IRPORT_SIR=m
-# CONFIG_DONGLE_OLD is not set
-CONFIG_NI5010=m
-CONFIG_PCMCIA_XIRTULIP=m
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_COMPUTONE=m
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_SX=m
-CONFIG_RIO=m
-CONFIG_RIO_OLDPCI=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_FTAPE=m
-CONFIG_ZFTAPE=m
-CONFIG_ZFT_DFLT_BLK_SZ=10240
-CONFIG_ZFT_COMPRESSOR=m
-CONFIG_FT_NR_BUFFERS=3
-CONFIG_FT_PROC_FS=y
-CONFIG_FT_NORMAL_DEBUG=y
-# CONFIG_FT_FULL_DEBUG is not set
-# CONFIG_FT_NO_TRACE is not set
-# CONFIG_FT_NO_TRACE_AT_ALL is not set
-CONFIG_FT_STD_FDC=y
-# CONFIG_FT_MACH2 is not set
-# CONFIG_FT_PROBE_FC10 is not set
-# CONFIG_FT_ALT_FDC is not set
-CONFIG_FT_FDC_THR=8
-CONFIG_FT_FDC_MAX_RATE=2000
-CONFIG_FT_ALPHA_CLOCK=0
-CONFIG_I2C_ELEKTOR=m
-# CONFIG_I2C_STUB 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=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_FS_MBCACHE=m
-CONFIG_LOG_BUF_SHIFT=14
+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
-CONFIG_BROKEN_ON_SMP=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines	Sun Apr 30 16:01:50 2006
@@ -2,9 +2,7 @@
 flavours:
  486
  686
- 686-smp
  k7
- k7-smp
 kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
@@ -23,13 +21,6 @@
 [686_image]
 recommends: libc6-i686
 
-[686-smp]
-class: PPro/Celeron/PII/PIII/P4 SMP
-longclass: multi-processor Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
-
-[686-smp_image]
-recommends: libc6-i686
-
 [k7]
 class: AMD K7
 longclass: 32bit AMD Duron/Athlon/AthlonXP
@@ -37,10 +28,3 @@
 [k7_image]
 recommends: libc6-i686
 
-[k7-smp]
-class: AMD K7 SMP
-longclass: 32-bit multi-processor AMD Duron/Athlon/AthlonXP
-
-[k7-smp_image]
-recommends: libc6-i686
-

More information about the Kernel-svn-changes mailing list