SOURCES: kernel-desktop.conf - direct replace from .config produce...

glen glen at pld-linux.org
Sun Oct 28 23:32:07 CET 2007


Author: glen                         Date: Sun Oct 28 22:32:07 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- direct replace from .config produced by menuconfig

---- Files affected:
SOURCES:
   kernel-desktop.conf (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop.conf
diff -u SOURCES/kernel-desktop.conf:1.2 SOURCES/kernel-desktop.conf:1.3
--- SOURCES/kernel-desktop.conf:1.2	Sun Oct 28 22:25:56 2007
+++ SOURCES/kernel-desktop.conf	Sun Oct 28 23:32:02 2007
@@ -3,24 +3,85 @@
 # $Date$
 #
 
+X86_32 all=y
+GENERIC_TIME all=y
+CLOCKSOURCE_WATCHDOG all=y
+GENERIC_CLOCKEVENTS all=y
+GENERIC_CLOCKEVENTS_BROADCAST all=y
+LOCKDEP_SUPPORT all=y
+STACKTRACE_SUPPORT all=y
+SEMAPHORE_SLEEPERS all=y
+X86 all=y
+MMU all=y
+ZONE_DMA all=y
+QUICKLIST all=y
+GENERIC_ISA_DMA all=y
+GENERIC_IOMAP all=y
+GENERIC_BUG all=y
+GENERIC_HWEIGHT all=y
+ARCH_MAY_HAVE_PC_FDC all=y
+DMI all=y
+#DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
 #
 # Code maturity level options
 #
 EXPERIMENTAL all=y
 LOCK_KERNEL all=y
+#INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
 #
+#LOCALVERSION="-0.8"
+LOCALVERSION_AUTO all=n
+SWAP all=y
+SWAP_PREFETCH all=y
 SYSVIPC all=y
+IPC_NS all=n
+SYSVIPC_SYSCTL all=y
+POSIX_MQUEUE all=y
+BSD_PROCESS_ACCT all=y
+BSD_PROCESS_ACCT_V3 all=y
+TASKSTATS all=n
+UTS_NS all=n
 AUDIT all=y
+AUDITSYSCALL all=y
 IKCONFIG all=y
+IKCONFIG_PROC all=y
+#LOG_BUF_SHIFT=16
+CPUSETS all=y
+SYSFS_DEPRECATED all=y
+RELAY all=y
+BLK_DEV_INITRD all=y
+#INITRAMFS_SOURCE=""
+CC_OPTIMIZE_FOR_SIZE all=n
+SYSCTL all=y
+EMBEDDED all=n
+UID16 all=y
+SYSCTL_SYSCALL all=y
 KALLSYMS all=y
-KALLSYMS_EXTRA_PASS all=n
-POSIX_MQUEUE all=y
-LOCALVERSION_AUTO all=n
-BSD_PROCESS_ACCT all=y
-IKCONFIG_PROCKCONFIG_PROC all=y
+KALLSYMS_ALL all=y
+KALLSYMS_EXTRA_PASS all=y
+HOTPLUG all=y
+PRINTK all=y
+BUG all=y
+ELF_CORE all=y
+BASE_FULL all=y
+FUTEX all=y
+ANON_INODES all=y
+EPOLL all=y
+SIGNALFD all=y
+EVENTFD all=y
+SHMEM all=y
+VM_EVENT_COUNTERS all=y
+SLUB_DEBUG all=y
+SLAB all=n
+SLUB all=y
+SLOB all=n
+RT_MUTEXES all=y
+TINY_SHMEM all=n
+#BASE_SMALL=0
 
 #
 # Loadable module support
@@ -30,6 +91,8 @@
 MODULE_FORCE_UNLOAD all=y
 MODVERSIONS all=n
 MODULE_SRCVERSION_ALL all=n
+KMOD all=y
+STOP_MACHINE all=y
 
 #
 # Block layer
@@ -42,48 +105,344 @@
 #
 # IO Schedulers
 #
+IOSCHED_NOOP all=y
+IOSCHED_AS all=y
+IOSCHED_DEADLINE all=y
+IOSCHED_CFQ all=y
+DEFAULT_AS all=n
+DEFAULT_DEADLINE all=n
+DEFAULT_CFQ all=y
+DEFAULT_NOOP all=n
+#DEFAULT_IOSCHED="cfq"
 
 #
 # Processor type and features
 #
+TICK_ONESHOT all=n
+NO_HZ all=n
+HIGH_RES_TIMERS all=n
 SMP all=y
+X86_PC all=y
+X86_ELAN all=n
+X86_VOYAGER all=n
+X86_NUMAQ all=n
+X86_SUMMIT all=n
+X86_BIGSMP all=n
+X86_VISWS all=n
+X86_GENERICARCH all=n
+X86_ES7000 all=n
+PARAVIRT all=y
+VMI all=y
+M386 all=n
+M486 all=n
+M586 all=n
+M586TSC all=n
+M586MMX all=n
+M686 all=y
+MPENTIUMII all=n
+MPENTIUMIII all=n
+MPENTIUMM all=n
+MCORE2 all=n
+MPENTIUM4 all=n
+MK6 all=n
+MK7 all=n
+MK8 all=n
+MCRUSOE all=n
+MEFFICEON all=n
+MWINCHIPC6 all=n
+MWINCHIP2 all=n
+MWINCHIP3D all=n
+MGEODEGX1 all=n
+MGEODE_LX all=n
+MCYRIXIII all=n
+MVIAC3_2 all=n
+MVIAC7 all=n
+X86_GENERIC all=y
+X86_CMPXCHG all=y
+#X86_L1_CACHE_SHIFT=7
+X86_XADD all=y
+RWSEM_XCHGADD_ALGORITHM all=y
+ARCH_HAS_ILOG2_U32 all=n
+ARCH_HAS_ILOG2_U64 all=n
+GENERIC_CALIBRATE_DELAY all=y
+X86_PPRO_FENCE all=y
+X86_WP_WORKS_OK all=y
+X86_INVLPG all=y
+X86_BSWAP all=y
+X86_POPAD_OK all=y
+X86_GOOD_APIC all=y
+X86_INTEL_USERCOPY all=y
+X86_USE_PPRO_CHECKSUM all=y
+X86_TSC all=y
+X86_CMOV all=y
+#X86_MINIMUM_CPU_MODEL=4
+HPET_TIMER all=y
+HPET_EMULATE_RTC all=y
+#NR_CPUS=16
+SCHED_SMT all=y
+SCHED_MC all=y
+PREEMPT_NONE all=n
+PREEMPT_VOLUNTARY all=n
+PREEMPT all=y
+PREEMPT_BKL all=y
+X86_LOCAL_APIC all=y
+X86_IO_APIC all=y
+X86_MCE all=y
+X86_MCE_NONFATAL all=y
+X86_MCE_P4THERMAL all=y
+VM86 all=y
+TOSHIBA all=m
+I8K all=m
+X86_REBOOTFIXUPS all=y
+MICROCODE all=m
+MICROCODE_OLD_INTERFACE all=y
+X86_MSR all=m
+X86_CPUID all=m
 
 #
 # Firmware Drivers
 #
+EDD all=m
+EFI_VARS all=m
+DELL_RBU all=m
+DCDBAS all=m
+NOHIGHMEM all=n
+HIGHMEM4G all=y
+HIGHMEM64G all=n
+VMSPLIT_3G all=y
+VMSPLIT_3G_OPT all=n
+VMSPLIT_2G all=n
+VMSPLIT_2G_OPT all=n
+VMSPLIT_1G all=n
+#PAGE_OFFSET=0xC0000000
+HIGHMEM all=y
+ARCH_FLATMEM_ENABLE all=y
+ARCH_SPARSEMEM_ENABLE all=y
+ARCH_SELECT_MEMORY_MODEL all=y
+ARCH_POPULATES_NODE_MAP all=y
+SELECT_MEMORY_MODEL all=y
+FLATMEM_MANUAL all=y
+DISCONTIGMEM_MANUAL all=n
+SPARSEMEM_MANUAL all=n
+FLATMEM all=y
+FLAT_NODE_MEM_MAP all=y
+SPARSEMEM_STATIC all=y
+#SPLIT_PTLOCK_CPUS=4
+RESOURCES_64BIT all=n
+#ZONE_DMA_FLAG=1
+#NR_QUICK=1
+DYN_PAGEFLAGS all=y
+HIGHPTE all=n
+MATH_EMULATION all=n
+MTRR all=y
+EFI all=y
+IRQBALANCE all=n
+BOOT_IOREMAP all=y
+SECCOMP all=y
+HZ_100 all=n
+HZ_250_NODEFAULT all=n
+HZ_300 all=n
+HZ_1000 all=y
+HZ_1500 all=n
+HZ_2000 all=n
+HZ_3000 all=n
+HZ_4000 all=n
+HZ_5000 all=n
+HZ_7500 all=n
+HZ_10000 all=n
+#HZ=1000
+KEXEC all=y
+CRASH_DUMP all=n
+#PHYSICAL_START=0x100000
+RELOCATABLE all=n
+#PHYSICAL_ALIGN=0x100000
+HOTPLUG_CPU all=y
+COMPAT_VDSO all=n
+ARCH_ENABLE_MEMORY_HOTPLUG all=y
 
 #
 # Power management options (ACPI, APM)
 #
 PM all=y
+PM_LEGACY all=y
+PM_DEBUG all=n
+PM_SYSFS_DEPRECATED all=n
 SOFTWARE_SUSPEND all=y
-PM_STD_PARTITION all=""
+#PM_STD_PARTITION=""
 SUSPEND2_CORE all=m
 
 #
+# Image Storage (you need at least one allocator)
+#
+SUSPEND2_FILE all=m
+SUSPEND2_SWAP all=m
+
+#
+# General Options
+#
+SUSPEND2_CRYPTO all=m
+SUSPEND2_USERUI all=m
+SUSPEND2_KEEP_IMAGE all=n
+SUSPEND2_REPLACE_SWSUSP all=n
+SUSPEND2_CHECKSUM all=y
+#SUSPEND2_DEFAULT_WAIT=25
+SUSPEND2_USERUI_EXPORTS all=y
+SUSPEND2_SWAP_EXPORTS all=y
+SUSPEND2_FILE_EXPORTS all=y
+SUSPEND2_CRYPTO_EXPORTS all=y
+SUSPEND2_CORE_EXPORTS all=y
+SUSPEND2_EXPORTS all=y
+SUSPEND2 all=y
+SUSPEND_SMP all=y
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+ACPI all=y
+ACPI_SLEEP all=y
+ACPI_SLEEP_PROC_FS all=y
+ACPI_SLEEP_PROC_SLEEP all=n
+ACPI_PROCFS all=y
+ACPI_AC all=m
+ACPI_BATTERY all=m
+ACPI_BUTTON all=m
+ACPI_VIDEO all=m
+ACPI_FAN all=m
+ACPI_DOCK all=m
+ACPI_BAY all=m
+ACPI_PROCESSOR all=m
+ACPI_HOTPLUG_CPU all=y
+ACPI_THERMAL all=m
+ACPI_ASUS all=m
+ACPI_TOSHIBA all=m
+ACPI_CUSTOM_DSDT all=n
+#ACPI_BLACKLIST_YEAR=0
+ACPI_DEBUG all=n
+ACPI_EC all=y
+ACPI_POWER all=y
+ACPI_SYSTEM all=y
+X86_PM_TIMER all=y
+ACPI_CONTAINER all=m
+ACPI_SBS all=m
+APM all=m
+APM_IGNORE_USER_SUSPEND all=n
+APM_DO_ENABLE all=n
+APM_CPU_IDLE all=y
+APM_DISPLAY_BLANK all=n
+APM_ALLOW_INTS all=n
+APM_REAL_MODE_POWER_OFF all=y
+
+#
 # CPU Frequency scaling
 #
 CPU_FREQ all=y
+CPU_FREQ_TABLE all=m
+CPU_FREQ_DEBUG all=n
+CPU_FREQ_STAT all=m
+CPU_FREQ_STAT_DETAILS all=y
+CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=y
+CPU_FREQ_DEFAULT_GOV_USERSPACE all=n
+CPU_FREQ_GOV_PERFORMANCE all=y
+CPU_FREQ_GOV_POWERSAVE all=m
+CPU_FREQ_GOV_USERSPACE all=m
+CPU_FREQ_GOV_ONDEMAND all=m
+CPU_FREQ_GOV_CONSERVATIVE all=m
+
+#
+# CPUFreq processor drivers
+#
+X86_ACPI_CPUFREQ all=m
+X86_POWERNOW_K6 all=m
+X86_POWERNOW_K7 all=m
+X86_POWERNOW_K7_ACPI all=y
+X86_POWERNOW_K8 all=m
+X86_POWERNOW_K8_ACPI all=y
+X86_GX_SUSPMOD all=m
+X86_SPEEDSTEP_CENTRINO all=m
+X86_SPEEDSTEP_CENTRINO_ACPI all=y
+X86_SPEEDSTEP_CENTRINO_TABLE all=y
+X86_SPEEDSTEP_ICH all=m
+X86_SPEEDSTEP_SMI all=m
+X86_P4_CLOCKMOD all=m
+X86_CPUFREQ_NFORCE2 all=m
+X86_LONGRUN all=m
+X86_LONGHAUL all=m
+X86_E_POWERSAVER all=m
+
+#
+# shared options
+#
+X86_ACPI_CPUFREQ_PROC_INTF all=y
+X86_SPEEDSTEP_LIB all=m
+X86_SPEEDSTEP_RELAXED_CAP_CHECK all=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 PCI all=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
+PCI_GOBIOS all=n
+PCI_GOMMCONFIG all=n
+PCI_GODIRECT all=n
+PCI_GOANY all=y
+PCI_BIOS all=y
+PCI_DIRECT all=y
+PCI_MMCONFIG all=y
+PCIEPORTBUS all=y
+HOTPLUG_PCI_PCIE all=m
+HOTPLUG_PCI_PCIE_POLL_EVENT_MODE all=n
+PCIEAER all=y
+ARCH_SUPPORTS_MSI all=y
+PCI_MSI all=y
+PCI_DEBUG all=n
+HT_IRQ all=y
+ISA_DMA_API all=y
+ISA all=y
+EISA all=y
+EISA_VLB_PRIMING all=y
+EISA_PCI_EISA all=y
+EISA_VIRTUAL_ROOT all=y
+EISA_NAMES all=y
+MCA all=n
+SCx200 all=m
+SCx200HR_TIMER all=m
+K8_NB all=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 PCCARD all=m
+PCMCIA_DEBUG all=n
+PCMCIA all=m
+PCMCIA_LOAD_CIS all=y
+PCMCIA_IOCTL all=n
+CARDBUS all=y
 
 #
 # PC-card bridges
 #
 YENTA all=m
-
+YENTA_O2 all=y
+YENTA_RICOH all=y
+YENTA_TI all=y
+YENTA_ENE_TUNE all=y
+YENTA_TOSHIBA all=y
+PD6729 all=m
+I82092 all=m
+I82365 all=m
+TCIC all=m
+PCMCIA_PROBE all=y
+PCCARD_NONSTATIC all=m
+HOTPLUG_PCI all=m
+HOTPLUG_PCI_FAKE all=m
+HOTPLUG_PCI_COMPAQ all=m
+HOTPLUG_PCI_COMPAQ_NVRAM all=y
+HOTPLUG_PCI_IBM all=m
+HOTPLUG_PCI_ACPI all=m
+HOTPLUG_PCI_ACPI_IBM all=m
+HOTPLUG_PCI_CPCI all=y
+HOTPLUG_PCI_CPCI_ZT5550 all=m
+HOTPLUG_PCI_CPCI_GENERIC all=m
+HOTPLUG_PCI_SHPC all=m
 
 #
 # Executable file formats
@@ -106,9 +465,9 @@
 XFRM all=y
 XFRM_USER all=m
 XFRM_SUB_POLICY all=y
-XFRM_MIGRATE all=y
+XFRM_MIGRATE all=n
 NET_KEY all=m
-NET_KEY_MIGRATE all=y
+NET_KEY_MIGRATE all=n
 RING all=m
 INET all=y
 IP_MULTICAST all=y
@@ -118,6 +477,11 @@
 IP_FIB_HASH all=y
 IP_MULTIPLE_TABLES all=y
 IP_ROUTE_MULTIPATH all=y
+IP_ROUTE_MULTIPATH_CACHED all=y
+IP_ROUTE_MULTIPATH_RR all=m
+IP_ROUTE_MULTIPATH_RANDOM all=m
+IP_ROUTE_MULTIPATH_WRANDOM all=m
+IP_ROUTE_MULTIPATH_DRR all=m
 IP_ROUTE_VERBOSE all=y
 IP_PNP all=y
 IP_PNP_DHCP all=y
@@ -160,8 +524,11 @@
 DEFAULT_VEGAS all=n
 DEFAULT_WESTWOOD all=n
 DEFAULT_RENO all=n
-DEFAULT_TCP_CONG all="bic"
+#DEFAULT_TCP_CONG="bic"
 TCP_MD5SIG all=y
+IP_VS all=m
+IP_VS_DEBUG all=n
+#IP_VS_TAB_BITS=12
 
 #
 # IPVS transport protocol load balancing support
@@ -191,9 +558,8 @@
 IP_VS_FTP all=m
 IPV6 all=m
 IPV6_PRIVACY all=y
-IPV6_ROUTER_PREF all=y
-IPV6_ROUTE_INFO all=y
-IPV6_OPTIMISTIC_DAD all=y
+IPV6_ROUTER_PREF all=n
+IPV6_OPTIMISTIC_DAD all=n
 INET6_AH all=m
 INET6_ESP all=m
 INET6_IPCOMP all=m
@@ -206,8 +572,7 @@
 INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
 IPV6_SIT all=m
 IPV6_TUNNEL all=m
-IPV6_MULTIPLE_TABLES all=y
-IPV6_SUBTREES all=y
+IPV6_MULTIPLE_TABLES all=n
 NETLABEL all=y
 NETWORK_SECMARK all=y
 NETFILTER all=y
@@ -217,26 +582,178 @@
 #
 # Core Netfilter Configuration
 #
+NETFILTER_NETLINK all=m
+NETFILTER_NETLINK_QUEUE all=m
+NETFILTER_NETLINK_LOG all=m
+NF_CONNTRACK_ENABLED all=m
+NF_CONNTRACK all=m
+NF_CT_ACCT all=y
+NF_CONNTRACK_MARK all=y
+NF_CONNTRACK_SECMARK all=n
+NF_CONNTRACK_EVENTS all=n
+NF_CT_PROTO_GRE all=m
+NF_CT_PROTO_SCTP all=m
+NF_CONNTRACK_AMANDA all=m
+NF_CONNTRACK_FTP all=m
+NF_CONNTRACK_H323 all=m
+NF_CONNTRACK_IRC all=m
+NF_CONNTRACK_NETBIOS_NS all=m
+NF_CONNTRACK_PPTP all=m
+NF_CONNTRACK_SANE all=m
+NF_CONNTRACK_SIP all=m
+NF_CONNTRACK_TFTP all=m
+NF_CONNTRACK_MMS all=m
+NF_CT_NETLINK all=m
+NETFILTER_XTABLES all=m
+NETFILTER_XT_TARGET_CLASSIFY all=m
+NETFILTER_XT_TARGET_CONNMARK all=m
+NETFILTER_XT_TARGET_DSCP all=m
+NETFILTER_XT_TARGET_MARK all=m
+NETFILTER_XT_TARGET_NFQUEUE all=m
+NETFILTER_XT_TARGET_NFLOG all=m
+NETFILTER_XT_TARGET_NOTRACK all=m
+NETFILTER_XT_TARGET_SECMARK all=m
+NETFILTER_XT_TARGET_TCPMSS all=m
+NETFILTER_XT_MATCH_COMMENT all=m
+NETFILTER_XT_MATCH_CONNBYTES all=m
+NETFILTER_XT_MATCH_CONNMARK all=m
+NETFILTER_XT_MATCH_CONNTRACK all=m
+NETFILTER_XT_MATCH_DCCP all=m
+NETFILTER_XT_MATCH_DSCP all=m
+NETFILTER_XT_MATCH_ESP all=n
+NETFILTER_XT_MATCH_HELPER all=m
+NETFILTER_XT_MATCH_LENGTH all=m
+NETFILTER_XT_MATCH_LIMIT all=m
+NETFILTER_XT_MATCH_MAC all=m
+NETFILTER_XT_MATCH_MARK all=m
+NETFILTER_XT_MATCH_POLICY all=n
+NETFILTER_XT_MATCH_MULTIPORT all=n
+NETFILTER_XT_MATCH_PHYSDEV all=m
+NETFILTER_XT_MATCH_PKTTYPE all=m
+NETFILTER_XT_MATCH_QUOTA all=m
+NETFILTER_XT_MATCH_REALM all=m
+NETFILTER_XT_MATCH_SCTP all=m
+NETFILTER_XT_MATCH_STATE all=m
+NETFILTER_XT_MATCH_LAYER7 all=m
+NETFILTER_XT_MATCH_LAYER7_DEBUG all=n
+NETFILTER_XT_MATCH_STATISTIC all=m
+NETFILTER_XT_MATCH_STRING all=m
+NETFILTER_XT_MATCH_TCPMSS all=m
+NETFILTER_XT_MATCH_HASHLIMIT all=m
 
 #
 # IP: Netfilter Configuration
 #
+NF_CONNTRACK_IPV4 all=m
+NF_CONNTRACK_PROC_COMPAT all=y
+IP_NF_QUEUE all=m
+IP_NF_IPTABLES all=m
+IP_NF_MATCH_IPRANGE all=m
+IP_NF_MATCH_TOS all=m
+IP_NF_MATCH_RECENT all=m
+IP_NF_MATCH_ECN all=m
+IP_NF_MATCH_AH all=n
+IP_NF_MATCH_TTL all=m
+IP_NF_MATCH_OWNER all=m
+IP_NF_MATCH_ADDRTYPE all=m
+IP_NF_FILTER all=m
+IP_NF_TARGET_REJECT all=m
+IP_NF_TARGET_LOG all=m
+IP_NF_TARGET_ULOG all=m
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop.conf?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list