SOURCES (LINUX_2_6_20): kernel-i386.config, kernel-ia64.config, ke...

pluto pluto at pld-linux.org
Fri Mar 16 12:24:14 CET 2007


Author: pluto                        Date: Fri Mar 16 11:24:14 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- merge smp settings.

---- Files affected:
SOURCES:
   kernel-i386.config (1.82.10.160.2.8 -> 1.82.10.160.2.9) , kernel-ia64.config (1.1.2.35 -> 1.1.2.35.2.1) , kernel-alpha.config (1.30.6.3.2.169.2.3 -> 1.30.6.3.2.169.2.4) , kernel-ppc.config (1.3.2.3.2.2.2.206.2.5 -> 1.3.2.3.2.2.2.206.2.6) , kernel-sparc.config (1.37.2.135.2.3 -> 1.37.2.135.2.4) , kernel-sparc64.config (1.48.2.121.2.3 -> 1.48.2.121.2.4) , kernel-x86_64.config (1.1.2.134.2.7 -> 1.1.2.134.2.8) 

---- Diffs:

================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.160.2.8 SOURCES/kernel-i386.config:1.82.10.160.2.9
--- SOURCES/kernel-i386.config:1.82.10.160.2.8	Mon Mar 12 09:44:52 2007
+++ SOURCES/kernel-i386.config	Fri Mar 16 12:24:09 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20
-# Wed Jan  3 01:09:26 2007
+# Mon Jan 29 23:26:42 2007
 #
 #
 CONFIG_X86_32=y
@@ -23,7 +23,7 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
@@ -43,6 +43,7 @@
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -78,6 +79,7 @@
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
 
 #
 # Block layer
@@ -103,7 +105,7 @@
 #
 # Processor type and features
 #
-# CONFIG_SMP is not set
+CONFIG_SMP=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -157,11 +159,13 @@
 CONFIG_X86_TSC=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
+CONFIG_NR_CPUS=8
+# CONFIG_SCHED_SMT is not set
+CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
+CONFIG_PREEMPT_BKL=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
@@ -205,6 +209,7 @@
 CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
 CONFIG_EFI=y
+# CONFIG_IRQBALANCE is not set
 CONFIG_BOOT_IOREMAP=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
@@ -216,6 +221,7 @@
 # CONFIG_CRASH_DUMP is not set
 CONFIG_RELOCATABLE=y
 CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
@@ -226,6 +232,7 @@
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_SYSFS_DEPRECATED is not set
 # CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SUSPEND_SMP=y
 
 #
 # General Options
@@ -248,6 +255,7 @@
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_IBM=m
@@ -673,7 +681,6 @@
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
-CONFIG_DMASCC=m
 CONFIG_SCC=m
 # CONFIG_SCC_DELAY is not set
 CONFIG_SCC_TRXECHO=y
@@ -726,21 +733,10 @@
 #
 # Old SIR device drivers
 #
-CONFIG_IRPORT_SIR=m
 
 #
 # Old Serial dongle support
 #
-CONFIG_DONGLE_OLD=y
-CONFIG_ESI_DONGLE_OLD=m
-CONFIG_ACTISYS_DONGLE_OLD=m
-CONFIG_TEKRAM_DONGLE_OLD=m
-CONFIG_GIRBIL_DONGLE_OLD=m
-CONFIG_LITELINK_DONGLE_OLD=m
-CONFIG_MCP2120_DONGLE_OLD=m
-CONFIG_OLD_BELKIN_DONGLE_OLD=m
-CONFIG_ACT200L_DONGLE_OLD=m
-CONFIG_MA600_DONGLE_OLD=m
 
 #
 # FIR device drivers
@@ -1317,13 +1313,10 @@
 CONFIG_CD_NO_IDESCSI=y
 CONFIG_AZTCD=m
 CONFIG_GSCD=m
-CONFIG_SBPCD=m
 CONFIG_MCDX=m
 CONFIG_OPTCD=m
-CONFIG_CM206=m
 CONFIG_SJCD=m
 CONFIG_ISP16_CDI=m
-CONFIG_CDU31A=m
 CONFIG_CDU535=m
 
 #
@@ -1395,6 +1388,7 @@
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
@@ -1477,7 +1471,6 @@
 CONFIG_ULTRA32=m
 CONFIG_SMC9194=m
 CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 
@@ -1496,7 +1489,6 @@
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
 CONFIG_AT1700=m
 CONFIG_DEPCA=m
 CONFIG_HP100=m
@@ -1976,15 +1968,12 @@
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_N_HDLC=m
-CONFIG_RISCOM8=m
 CONFIG_SPECIALIX=m
 # CONFIG_SPECIALIX_RTSCTS is not set
 CONFIG_SX=m
 CONFIG_RIO=m
 # CONFIG_RIO_OLDPCI is not set
 CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
 
 #
 # Serial drivers
@@ -2175,7 +2164,6 @@
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
-CONFIG_I2C_ELEKTOR=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_I810=m
 CONFIG_I2C_PIIX4=m
@@ -3646,6 +3634,10 @@
 CONFIG_IOMAP_COPY=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
 CONFIG_KTIME_SCALAR=y
 

================================================================
Index: SOURCES/kernel-ia64.config
diff -u SOURCES/kernel-ia64.config:1.1.2.35 SOURCES/kernel-ia64.config:1.1.2.35.2.1
--- SOURCES/kernel-ia64.config:1.1.2.35	Sun Nov 26 10:11:11 2006
+++ SOURCES/kernel-ia64.config	Fri Mar 16 12:24:09 2007
@@ -3,7 +3,6 @@
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
 
 #
 # General setup
@@ -42,6 +41,7 @@
 CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
 
 #
 # Processor type and features
@@ -72,9 +72,12 @@
 CONFIG_IA64_CYCLONE=y
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=18
-# CONFIG_SMP is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=64
+CONFIG_HOTPLUG_CPU=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_BKL=y
+CONFIG_HAVE_DEC_LOCK=y
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_PERFMON=y
@@ -256,11 +259,11 @@
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_PC_CML1=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_FIFO is not set
 CONFIG_PARPORT_PC_SUPERIO=y
 CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
+# CONFIG_PARPORT_1284 is not set
 
 #
 # Plug and Play support
@@ -443,14 +446,10 @@
 CONFIG_SCSI_SATA_SIS=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_PIO=m
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
@@ -738,8 +737,6 @@
 #
 # AX.25 network device drivers
 #
-CONFIG_MKISS=m
-CONFIG_6PACK=m
 CONFIG_BPQETHER=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
@@ -788,21 +785,10 @@
 #
 # Old SIR device drivers
 #
-CONFIG_IRPORT_SIR=m
 
 #
 # Old Serial dongle support
 #
-CONFIG_DONGLE_OLD=y
-CONFIG_ESI_DONGLE_OLD=m
-CONFIG_ACTISYS_DONGLE_OLD=m
-CONFIG_TEKRAM_DONGLE_OLD=m
-CONFIG_GIRBIL_DONGLE_OLD=m
-CONFIG_LITELINK_DONGLE_OLD=m
-CONFIG_MCP2120_DONGLE_OLD=m
-CONFIG_OLD_BELKIN_DONGLE_OLD=m
-CONFIG_ACT200L_DONGLE_OLD=m
-CONFIG_MA600_DONGLE_OLD=m
 
 #
 # FIR device drivers
@@ -886,7 +872,6 @@
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
 CONFIG_HP100=m
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
@@ -1193,24 +1178,13 @@
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_COMPUTONE is not set
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-# CONFIG_ISI is not set
-CONFIG_SYNCLINK=m
+# CONFIG_SYNCLINK is not set
 CONFIG_SYNCLINKMP=m
 CONFIG_N_HDLC=m
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
 CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
 CONFIG_SGI_SNSC=y
 
 #
@@ -1409,9 +1383,7 @@
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_SAA5246A=m
 CONFIG_VIDEO_SAA5249=m
@@ -1652,9 +1624,8 @@
 #
 CONFIG_SOUND_PRIME=m
 CONFIG_SOUND_BT878=m
-CONFIG_SOUND_CMPCI=m
-CONFIG_SOUND_EMU10K1=m
-CONFIG_MIDI_EMU10K1=y
+# CONFIG_SOUND_CMPCI is not set
+# CONFIG_SOUND_EMU10K1 is not set
 CONFIG_SOUND_FUSION=m
 CONFIG_SOUND_CS4281=m
 CONFIG_SOUND_ES1370=m
@@ -1667,52 +1638,9 @@
 CONFIG_SOUND_TRIDENT=m
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
-CONFIG_SOUND_VIA82CXXX=m
-CONFIG_MIDI_VIA82CXXX=y
-CONFIG_SOUND_OSS=m
-# CONFIG_SOUND_TRACEINIT is not set
-# CONFIG_SOUND_DMAP is not set
-CONFIG_SOUND_AD1816=m
-CONFIG_SOUND_AD1889=m
-CONFIG_SOUND_SGALAXY=m
-CONFIG_SOUND_ADLIB=m
-CONFIG_SOUND_ACI_MIXER=m
-CONFIG_SOUND_CS4232=m
-CONFIG_SOUND_SSCAPE=m
-CONFIG_SOUND_GUS=m
-CONFIG_SOUND_GUS16=y
-CONFIG_SOUND_GUSMAX=y
-CONFIG_SOUND_VMIDI=m
-CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_MSS=m
-CONFIG_SOUND_MPU401=m
-CONFIG_SOUND_NM256=m
-CONFIG_SOUND_MAD16=m
-CONFIG_MAD16_OLDCARD=y
-CONFIG_SOUND_PAS=m
-CONFIG_SOUND_PSS=m
-CONFIG_PSS_MIXER=y
-# CONFIG_PSS_HAVE_BOOT is not set
-CONFIG_SOUND_SB=m
-CONFIG_SOUND_AWE32_SYNTH=m
-CONFIG_SOUND_WAVEFRONT=m
-CONFIG_SOUND_MAUI=m
-CONFIG_SOUND_YM3812=m
-CONFIG_SOUND_OPL3SA1=m
-CONFIG_SOUND_OPL3SA2=m
-CONFIG_SOUND_YMFPCI=m
-CONFIG_SOUND_YMFPCI_LEGACY=y
-CONFIG_SOUND_UART6850=m
-CONFIG_SOUND_AEDSP16=m
-CONFIG_SC6600=y
-CONFIG_SC6600_JOY=y
-CONFIG_SC6600_CDROM=4
-CONFIG_SC6600_CDROMBASE=0x0
-# CONFIG_AEDSP16_MSS is not set
-CONFIG_AEDSP16_SBPRO=y
-CONFIG_AEDSP16_MPU401=y
+# CONFIG_SOUND_VIA82CXXX is not set
+# CONFIG_SOUND_OSS is not set
 CONFIG_SOUND_TVMIXER=m
-CONFIG_SOUND_KAHLUA=m
 CONFIG_SOUND_ALI5455=m
 CONFIG_SOUND_FORTE=m
 CONFIG_SOUND_RME96XX=m
@@ -1854,7 +1782,6 @@
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m

================================================================
Index: SOURCES/kernel-alpha.config
diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.169.2.3 SOURCES/kernel-alpha.config:1.30.6.3.2.169.2.4
--- SOURCES/kernel-alpha.config:1.30.6.3.2.169.2.3	Mon Mar 12 23:04:30 2007
+++ SOURCES/kernel-alpha.config	Fri Mar 16 12:24:09 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20.1
-# Mon Feb 26 00:22:50 2007
+# Mon Feb 26 00:29:25 2007
 #
 CONFIG_ALPHA=y
 CONFIG_64BIT=y
@@ -15,13 +15,14 @@
 # CONFIG_GENERIC_IOMAP is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_AUTO_IRQ_AFFINITY=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
@@ -41,6 +42,7 @@
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -77,6 +79,7 @@
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
 
 #
 # Block layer
@@ -141,7 +144,9 @@
 CONFIG_ALPHA_BROKEN_IRQ_MASK=y
 CONFIG_EISA=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_SMP is not set
+CONFIG_SMP=y
+CONFIG_HAVE_DEC_LOCK=y
+CONFIG_NR_CPUS=64
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -466,7 +471,6 @@
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
-CONFIG_DMASCC=m
 CONFIG_SCC=m
 # CONFIG_SCC_DELAY is not set
 CONFIG_SCC_TRXECHO=y
@@ -518,21 +522,10 @@
 #
 # Old SIR device drivers
 #
-CONFIG_IRPORT_SIR=m
 
 #
 # Old Serial dongle support
 #
-CONFIG_DONGLE_OLD=y
-CONFIG_ESI_DONGLE_OLD=m
-CONFIG_ACTISYS_DONGLE_OLD=m
-CONFIG_TEKRAM_DONGLE_OLD=m
-CONFIG_GIRBIL_DONGLE_OLD=m
-CONFIG_LITELINK_DONGLE_OLD=m
-CONFIG_MCP2120_DONGLE_OLD=m
-CONFIG_OLD_BELKIN_DONGLE_OLD=m
-CONFIG_ACT200L_DONGLE_OLD=m
-CONFIG_MA600_DONGLE_OLD=m
 
 #
 # FIR device drivers
@@ -1075,13 +1068,10 @@
 CONFIG_CD_NO_IDESCSI=y
 CONFIG_AZTCD=m
 CONFIG_GSCD=m
-CONFIG_SBPCD=m
 CONFIG_MCDX=m
 CONFIG_OPTCD=m
-CONFIG_CM206=m
 CONFIG_SJCD=m
 CONFIG_ISP16_CDI=m
-CONFIG_CDU31A=m
 CONFIG_CDU535=m
 
 #
@@ -1235,7 +1225,6 @@
 CONFIG_ULTRA32=m
 CONFIG_SMC9194=m
 CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 
@@ -1254,7 +1243,6 @@
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
 CONFIG_AT1700=m
 CONFIG_DEPCA=m
 CONFIG_HP100=m
@@ -1714,15 +1702,12 @@
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_N_HDLC=m
-CONFIG_RISCOM8=m
 CONFIG_SPECIALIX=m
 # CONFIG_SPECIALIX_RTSCTS is not set
 CONFIG_SX=m
 CONFIG_RIO=m
 # CONFIG_RIO_OLDPCI is not set
 CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
 
 #
 # Serial drivers
@@ -1852,7 +1837,6 @@
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
-CONFIG_I2C_ELEKTOR=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_I810=m
 CONFIG_I2C_PIIX4=m

================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.2.5 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.2.6
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.2.5	Mon Mar 12 11:34:13 2007
+++ SOURCES/kernel-ppc.config	Fri Mar 16 12:24:09 2007
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20.1
-# Sun Feb 25 23:24:50 2007
+# Sun Feb 25 23:23:27 2007
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -23,7 +23,7 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
@@ -43,6 +43,7 @@
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -77,6 +78,7 @@
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
 
 #
 # Block layer
@@ -164,7 +166,9 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.160.2.8&r2=1.82.10.160.2.9&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ia64.config?r1=1.1.2.35&r2=1.1.2.35.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.169.2.3&r2=1.30.6.3.2.169.2.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.206.2.5&r2=1.3.2.3.2.2.2.206.2.6&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-sparc.config?r1=1.37.2.135.2.3&r2=1.37.2.135.2.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-sparc64.config?r1=1.48.2.121.2.3&r2=1.48.2.121.2.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.134.2.7&r2=1.1.2.134.2.8&f=u



More information about the pld-cvs-commit mailing list