SOURCES: kernel-desktop-i386.config, kernel-desktop-ppc.config, ke...
adamg
adamg at pld-linux.org
Sat Aug 18 22:27:48 CEST 2007
Author: adamg Date: Sat Aug 18 20:27:48 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- since we no longer produce smp and up packages, prefer smp config
---- Files affected:
SOURCES:
kernel-desktop-i386.config (1.9 -> 1.10) , kernel-desktop-ppc.config (1.9 -> 1.10) , kernel-desktop-x86_64.config (1.10 -> 1.11) , kernel-desktop-i386-smp.config (1.9 -> NONE) (REMOVED), kernel-desktop-ppc-smp.config (1.9 -> NONE) (REMOVED), kernel-desktop-x86_64-smp.config (1.10 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-i386.config
diff -u SOURCES/kernel-desktop-i386.config:1.9 SOURCES/kernel-desktop-i386.config:1.10
--- SOURCES/kernel-desktop-i386.config:1.9 Thu Aug 16 23:11:22 2007
+++ SOURCES/kernel-desktop-i386.config Sat Aug 18 22:27:43 2007
@@ -10,7 +10,7 @@
#
# Processor type and features
#
-# CONFIG_SMP is not set
+CONFIG_SMP=y
#
# Subarchitecture Type
@@ -61,12 +61,13 @@
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
+CONFIG_NR_CPUS=16
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
#
# RCU implementation type:
#
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
@@ -106,19 +107,18 @@
CONFIG_MATH_EMULATION=y
CONFIG_MTRR=y
CONFIG_EFI=y
+CONFIG_IRQBALANCE=y
CONFIG_BOOT_IOREMAP=y
# CONFIG_REGPARM is not set
CONFIG_SECCOMP=y
-#
-# Timer frequency
-#
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
# CONFIG_RELOCATABLE is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_PHYSICAL_START=0x100000
CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_HOTPLUG_CPU is not set
#
# Power management options (ACPI, APM)
@@ -287,12 +287,13 @@
CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y
-#
-# Library routines
-#
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-desktop-ppc.config
diff -u SOURCES/kernel-desktop-ppc.config:1.9 SOURCES/kernel-desktop-ppc.config:1.10
--- SOURCES/kernel-desktop-ppc.config:1.9 Wed Mar 28 00:50:53 2007
+++ SOURCES/kernel-desktop-ppc.config Sat Aug 18 22:27:43 2007
@@ -12,14 +12,10 @@
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
CONFIG_PPC_UDBG_16550=y
-# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_GENERIC_TBSYNC=y
# CONFIG_DEFAULT_UIMAGE is not set
#
-# Processor support
-#
-
-#
# Processor Type
#
CONFIG_CLASSIC32=y
@@ -37,7 +33,8 @@
CONFIG_ALTIVEC=y
CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_32=y
-# CONFIG_SMP is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
#
# Machine type
@@ -90,7 +87,9 @@
# RCU implementation type:
#
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_HOTPLUG_CPU is not set
CONFIG_KEXEC=y
+# CONFIG_IRQ_ALL_CPUS is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
================================================================
Index: SOURCES/kernel-desktop-x86_64.config
diff -u SOURCES/kernel-desktop-x86_64.config:1.10 SOURCES/kernel-desktop-x86_64.config:1.11
--- SOURCES/kernel-desktop-x86_64.config:1.10 Thu Aug 16 23:11:22 2007
+++ SOURCES/kernel-desktop-x86_64.config Sat Aug 18 22:27:43 2007
@@ -3,7 +3,6 @@
CONFIG_X86=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_MMU=y
-CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_CMPXCHG=y
CONFIG_EARLY_PRINTK=y
@@ -27,23 +26,33 @@
# CONFIG_GENERIC_CPU is not set
CONFIG_X86_L1_CACHE_BYTES=128
CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_INTERNODE_CACHE_BYTES=128
CONFIG_X86_TSC=y
CONFIG_X86_GOOD_APIC=y
CONFIG_MICROCODE=m
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
+CONFIG_X86_HT=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_MTRR=y
-# CONFIG_SMP is not set
+CONFIG_SMP=y
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
#
# RCU implementation type:
#
+CONFIG_NUMA=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_K8_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_NR_CPUS=64
+CONFIG_HOTPLUG_CPU=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_CALGARY_IOMMU=y
@@ -56,14 +65,16 @@
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_START=0x200000
-CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_PHYSICAL_START=0x100000
+CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_SECCOMP=y
# CONFIG_CC_STACKPROTECTOR is not set
+
CONFIG_REORDER=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_ISA_DMA_API=y
+CONFIG_GENERIC_PENDING_IRQ=y
#
# ACPI (Advanced Configuration and Power Interface) Support
@@ -185,7 +196,7 @@
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_FRAME_POINTER is not set
# CONFIG_UNWIND_INFO is not set
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-i386.config?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-ppc.config?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-x86_64.config?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list