SOURCES: kernel-desktop-common.config, kernel-desktop-x86_64.confi...

glen glen at pld-linux.org
Tue Apr 8 23:50:57 CEST 2008 

Author: glen                         Date: Tue Apr  8 21:50:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged x86_64 config to -common

---- Files affected:
SOURCES:
   kernel-desktop-common.config (1.39 -> 1.40) , kernel-desktop-x86_64.config (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.39 SOURCES/kernel-desktop-common.config:1.40
--- SOURCES/kernel-desktop-common.config:1.39	Tue Apr  8 23:44:14 2008
+++ SOURCES/kernel-desktop-common.config	Tue Apr  8 23:50:52 2008
@@ -3,7 +3,7 @@
 # Code maturity level options
 #
 EXPERIMENTAL all=y
-BROKEN_ON_SMP all=y i386=
+BROKEN_ON_SMP all=y i386= x86_64=
 LOCK_KERNEL all=y
 INIT_ENV_ARG_LIMIT all=32
 
@@ -14,7 +14,7 @@
 LOCALVERSION_AUTO all=n
 SWAP all=y
 SYSVIPC all=y
-IPC_NS all=n i386=
+IPC_NS all=n i386= x86_64=
 POSIX_MQUEUE all=y
 BSD_PROCESS_ACCT all=y
 BSD_PROCESS_ACCT_V3 all=y
@@ -23,7 +23,7 @@
 DMADEVICES all=y ppc=
 AUXDISPLAY all=y
 
-X86_32 all=y
+X86_32 all=y x86_64=n
 SEMAPHORE_SLEEPERS all=y
 X86 all=y
 MMU all=y
@@ -37,25 +37,25 @@
 #
 SMP all=y
 HIGH_RES_TIMERS i386=y x86_64=n ppc=y
-PARAVIRT all=y i386=
-VMI all=y i386=
+PARAVIRT all=y i386= x86_64=
+VMI all=y i386= x86_64=
 
 #
 # Timer frequency
 #
-NO_HZ all=n i386=n
+NO_HZ all=n i386=n x86_64=n
 HZ_100 all=n
 HZ_250 all=n
 HZ_300 all=n
-HZ_1000 all=n i386=y
-HZ_1500 all=n i386=
-HZ_2000 all=n i386=
-HZ_3000 all=n i386=
-HZ_4000 all=n i386=
-HZ_5000 all=n i386=
-HZ_7500 all=n i386=
-HZ_10000 all=n i386=
-HZ all=n i386=1000
+HZ_1000 all=n i386=y x86_64=y
+HZ_1500 all=n i386= x86_64=
+HZ_2000 all=n i386= x86_64=
+HZ_3000 all=n i386= x86_64=
+HZ_4000 all=n i386= x86_64=
+HZ_5000 all=n i386= x86_64=
+HZ_7500 all=n i386= x86_64=
+HZ_10000 all=n i386= x86_64=
+HZ all=n i386=1000 x86_64=1000
 
 #
 # Subarchitecture Type
@@ -86,7 +86,7 @@
 MPENTIUM4 all=n
 MK6 all=n
 MK7 all=n
-MK8 all=n
+MK8 all=n x86_64=y
 MCRUSOE all=n
 MEFFICEON all=n
 MWINCHIPC6 all=n
@@ -97,16 +97,16 @@
 MCYRIXIII all=n
 MVIAC3_2 all=n
 MVIAC7 all=n
-X86_GENERIC all=y
-X86_L1_CACHE_SHIFT all=7
-RWSEM_GENERIC_SPINLOCK all=y i386=n
+X86_GENERIC all=y x86_64=
+X86_L1_CACHE_SHIFT all=7 x86_64=6
+RWSEM_GENERIC_SPINLOCK all=y i386=n x86_64=y
 GENERIC_CALIBRATE_DELAY all=y
-X86_PPRO_FENCE all=y
-X86_F00F_BUG all=y i386=
+X86_PPRO_FENCE all=y x86_64=
+X86_F00F_BUG all=y i386= x86_64=
 X86_INTEL_USERCOPY all=y
 HPET_TIMER all=y
 HPET_EMULATE_RTC all=y
-NR_CPUS all=16
+NR_CPUS all=16 x86_64=64
 SCHED_SMT all=y
 SCHED_MC all=y
 
@@ -116,11 +116,11 @@
 X86_LOCAL_APIC all=y
 X86_IO_APIC all=y
 X86_MCE all=y
-X86_MCE_NONFATAL all=y
-X86_MCE_P4THERMAL all=y
-TOSHIBA all=m
-I8K all=m
-X86_REBOOTFIXUPS all=y
+X86_MCE_NONFATAL all=y x86_64=
+X86_MCE_P4THERMAL all=y x86_64=
+TOSHIBA all=m x86_64=
+I8K all=m x86_64=
+X86_REBOOTFIXUPS all=y x86_64=
 MICROCODE all=m
 X86_MSR all=m
 X86_CPUID all=m
@@ -129,39 +129,39 @@
 # Firmware Drivers
 #
 EDD all=m
-EFI_VARS all=m
+EFI_VARS all=m x86_64=
 DELL_RBU all=m
 DCDBAS all=m
 
 #
 # High Memory Support
 #
-NOHIGHMEM all=n
-HIGHMEM4G all=y
-HIGHMEM64G all=n
-VMSPLIT_3G all=y i386=
-VMSPLIT_3G_OPT all=n i386=
-VMSPLIT_2G all=n i386=
-VMSPLIT_1G all=n i386=
-PAGE_OFFSET all=0xC0000000
-HIGHMEM all=y
-ARCH_FLATMEM_ENABLE all=y
+NOHIGHMEM all=n x86_64=
+HIGHMEM4G all=y x86_64=
+HIGHMEM64G all=n x86_64=
+VMSPLIT_3G all=y i386= x86_64=
+VMSPLIT_3G_OPT all=n i386= x86_64=
+VMSPLIT_2G all=n i386= x86_64=
+VMSPLIT_1G all=n i386= x86_64=
+PAGE_OFFSET all=0xC0000000 x86_64=
+HIGHMEM all=y x86_64=
+ARCH_FLATMEM_ENABLE all=y x86_64=
 ARCH_SPARSEMEM_ENABLE all=y
-ARCH_SELECT_MEMORY_MODEL all=y
-HIGHPTE all=n
-MATH_EMULATION all=y i386=n
+ARCH_SELECT_MEMORY_MODEL all=y x86_64=
+HIGHPTE all=n x86_64=
+MATH_EMULATION all=y i386=n x86_64=
 MTRR all=y
-EFI all=y
-IRQBALANCE all=n
-BOOT_IOREMAP all=y
+EFI all=y x86_64=
+IRQBALANCE all=n x86_64=
+BOOT_IOREMAP all=y x86_64=
 SECCOMP all=y
 
 KEXEC all=y
 CRASH_DUMP all=n
 RELOCATABLE all=n
-COMPAT_VDSO all=n
-PHYSICAL_START all=0x100000
-PHYSICAL_ALIGN all=0x100000
+COMPAT_VDSO all=n x86_64=
+PHYSICAL_START all=0x100000 x86_64=0x200000
+PHYSICAL_ALIGN all=0x100000 x86_64=0x200000
 HOTPLUG_CPU all=y
 
 #
@@ -172,13 +172,13 @@
 TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 
-UTS_NS all=n i386=
+UTS_NS all=n i386= x86_64=
 SYSCTL all=y
 AUDIT all=y
 AUDITSYSCALL all=y
 IKCONFIG all=y
 IKCONFIG_PROC all=y
-IKPROC all=y i386=
+IKPROC all=y i386= x86_64=
 SYSFS_DEPRECATED all=y
 CPUSETS all=y
 CGROUPS all=y
@@ -225,10 +225,10 @@
 #
 # Block layer
 #
-LBD all=y
+LBD all=y x86_64=
 BLK_DEV all=y
 BLK_DEV_IO_TRACE all=y
-LSF all=y
+LSF all=y x86_64=
 BLK_DEV_BSG all=y
 
 #
@@ -257,10 +257,10 @@
 # Memory model
 #
 FLATMEM_MANUAL all=n i386=y
-RESOURCES_64BIT all=n
-DISCONTIGMEM_MANUAL all=n
+RESOURCES_64BIT all=n x86_64=y
+DISCONTIGMEM_MANUAL all=n x86_64=y
 SPARSEMEM_MANUAL all=n
-FLATMEM all=y
+FLATMEM all=y x86_64=
 FLAT_NODE_MEM_MAP all=y
 NEED_MULTIPLE_NODES all=y i386=
 SPARSEMEM_STATIC all=n i386=y
@@ -273,15 +273,15 @@
 PM all=y
 PM_LEGACY all=y
 PM_DEBUG all=n
-PM_SYSFS_DEPRECATED all=n i386=
+PM_SYSFS_DEPRECATED all=n i386= x86_64=
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 ACPI all=y
 ACPI_SLEEP all=y
-ACPI_SLEEP_PROC_FS all=y i386=
-ACPI_SLEEP_PROC_SLEEP all=n i386=
+ACPI_SLEEP_PROC_FS all=y i386= x86_64=
+ACPI_SLEEP_PROC_SLEEP all=n i386= x86_64=
 ACPI_PROCFS all=y
 ACPI_AC all=m
 ACPI_BATTERY all=m
@@ -296,7 +296,7 @@
 ACPI_ASUS all=m
 ACPI_TOSHIBA all=m
 ACPI_CUSTOM_DSDT all=n
-ACPI_BLACKLIST_YEAR all=0
+ACPI_BLACKLIST_YEAR all=0 x86_64=0
 ACPI_DEBUG all=n
 ACPI_EC all=y
 ACPI_POWER all=y
@@ -304,16 +304,16 @@
 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 all=m x86_64=
+APM_IGNORE_USER_SUSPEND all=n x86_64=
+APM_DO_ENABLE all=n x86_64=
 APM_CPU_IDLE i386=y
-APM_DISPLAY_BLANK all=n
-APM_ALLOW_INTS all=n
-APM_REAL_MODE_POWER_OFF all=y
-SOFTWARE_SUSPEND all=y i386=
-SUSPEND_SMP all=y i386=
-PM_STD_PARTITION all=""
+APM_DISPLAY_BLANK all=n x86_64=
+APM_ALLOW_INTS all=n x86_64=
+APM_REAL_MODE_POWER_OFF all=y x86_64=
+SOFTWARE_SUSPEND all=y i386= x86_64=
+SUSPEND_SMP all=y i386= x86_64=
+PM_STD_PARTITION all="" x86_64=""
 
 #
 # CPU Frequency scaling
@@ -327,7 +327,7 @@
 #
 # Default CPUFreq governor
 #
-CPU_FREQ_DEFAULT_GOV_PERFORMANCE i386=y
+CPU_FREQ_DEFAULT_GOV_PERFORMANCE i386=y x86_64=y
 CPU_FREQ_DEFAULT_GOV_USERSPACE all=n
 CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n
 CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n
@@ -341,26 +341,26 @@
 # 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_K6 all=m x86_64=
+X86_POWERNOW_K7 all=m x86_64=
+X86_POWERNOW_K7_ACPI all=y x86_64=
 X86_POWERNOW_K8 all=m
 X86_POWERNOW_K8_ACPI all=y
-X86_GX_SUSPMOD all=m
+X86_GX_SUSPMOD all=m x86_64=
 X86_SPEEDSTEP_CENTRINO all=m
-X86_SPEEDSTEP_CENTRINO_ACPI all=y i386=
-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
-
-PROFILING all=y i386=
-OPROFILE all=m i386=
-KPROBES all=n i386=
+X86_SPEEDSTEP_CENTRINO_ACPI all=y i386= x86_64=
+X86_SPEEDSTEP_CENTRINO_TABLE all=y x86_64=
+X86_SPEEDSTEP_ICH all=m x86_64=
+X86_SPEEDSTEP_SMI all=m x86_64=
+X86_P4_CLOCKMOD all=m x86_64=n
+X86_CPUFREQ_NFORCE2 all=m x86_64=
+X86_LONGRUN all=m x86_64=
+X86_LONGHAUL all=m x86_64=
+X86_E_POWERSAVER all=m x86_64=
+
+PROFILING all=y i386= x86_64=
+OPROFILE all=m i386= x86_64=
+KPROBES all=n i386= x86_64=
 
 #
 # Kernel hacking
@@ -372,29 +372,29 @@
 EARLY_PRINTK all=y
 DEBUG_STACKOVERFLOW all=n
 DEBUG_STACK_USAGE all=n
-DEBUG_PAGEALLOC all=n i386=
+DEBUG_PAGEALLOC all=n i386= x86_64=
 DEBUG_RODATA all=n
-4KSTACKS all=n
-X86_FIND_SMP_CONFIG all=y
-X86_MPPARSE all=y
-DOUBLEFAULT all=y
+4KSTACKS all=n x86_64=
+X86_FIND_SMP_CONFIG all=y x86_64=
+X86_MPPARSE all=y x86_64=
+DOUBLEFAULT all=y x86_64=
 
 GENERIC_HARDIRQS all=y
 GENERIC_IRQ_PROBE all=y
 GENERIC_PENDING_IRQ all=y
-X86_SMP all=y
-X86_HT all=y
-X86_BIOS_REBOOT all=y
-X86_TRAMPOLINE all=y
-KTIME_SCALAR all=y
+X86_SMP all=y x86_64=
+X86_HT all=y x86_64=
+X86_BIOS_REBOOT all=y x86_64=
+X86_TRAMPOLINE all=y x86_64=
+KTIME_SCALAR all=y x86_64=n
 
 
 #
 # shared options
 #
-X86_ACPI_CPUFREQ_PROC_INTF all=y
-X86_SPEEDSTEP_LIB all=m
-X86_SPEEDSTEP_RELAXED_CAP_CHECK all=y
+X86_ACPI_CPUFREQ_PROC_INTF all=y x86_64=n
+X86_SPEEDSTEP_LIB all=m x86_64=n
+X86_SPEEDSTEP_RELAXED_CAP_CHECK all=y x86_64=
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -408,29 +408,29 @@
 
 PCIEPORTBUS all=y
 HOTPLUG_PCI_PCIE all=m
-HOTPLUG_PCI_PCIE_POLL_EVENT_MODE all=n i386=
+HOTPLUG_PCI_PCIE_POLL_EVENT_MODE all=n i386= x86_64=
 
 #
 # PCI access mode
 #
-PCI_GOBIOS all=n
-PCI_GOMMCONFIG all=n
-PCI_GODIRECT all=n
-PCI_GOANY all=y
-PCI_BIOS all=y
+PCI_GOBIOS all=n x86_64=
+PCI_GOMMCONFIG all=n x86_64=
+PCI_GODIRECT all=n x86_64=
+PCI_GOANY all=y x86_64=
+PCI_BIOS all=y x86_64=
 PCI_DIRECT all=y
 PCI_MMCONFIG all=y
 PCIEAER 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
+ISA all=y x86_64=
+EISA all=y x86_64=
+EISA_VLB_PRIMING all=y x86_64=
+EISA_PCI_EISA all=y x86_64=
+EISA_VIRTUAL_ROOT all=y x86_64=
+EISA_NAMES all=y x86_64=
+MCA all=n x86_64=
+SCx200 all=m x86_64=
+SCx200HR_TIMER all=m x86_64=
 
 
 #
@@ -454,9 +454,9 @@
 YENTA_TOSHIBA all=y
 PD6729 all=m
 I82092 all=m
-I82365 all=m
-TCIC all=m
-PCMCIA_PROBE all=y
+I82365 all=m x86_64=
+TCIC all=m x86_64=
+PCMCIA_PROBE all=y x86_64=
 PCCARD_NONSTATIC all=m
 
 #
@@ -464,9 +464,9 @@
 #
 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_COMPAQ all=m x86_64=
+HOTPLUG_PCI_COMPAQ_NVRAM all=y x86_64=
+HOTPLUG_PCI_IBM all=m x86_64=
 HOTPLUG_PCI_ACPI all=m
 HOTPLUG_PCI_ACPI_IBM all=m
 HOTPLUG_PCI_CPCI all=y
@@ -478,7 +478,7 @@
 # Executable file formats / Emulations
 #
 BINFMT_ELF all=y
-BINFMT_AOUT all=m
+BINFMT_AOUT all=m x86_64=
 BINFMT_MISC all=m
 
 #
@@ -501,7 +501,7 @@
 XFRM_MIGRATE all=n
 NET_KEY all=m
 NET_KEY_MIGRATE all=n
-RING all=m i386=
+RING all=m i386= x86_64=
 INET all=y
 IP_MULTICAST all=y
 IP_ADVANCED_ROUTER all=y
@@ -510,11 +510,11 @@
 IP_FIB_HASH all=y
 IP_MULTIPLE_TABLES all=y
 IP_ROUTE_MULTIPATH all=y
-IP_ROUTE_MULTIPATH_CACHED all=y i386=
-IP_ROUTE_MULTIPATH_RR all=m i386=
-IP_ROUTE_MULTIPATH_RANDOM all=m i386=
-IP_ROUTE_MULTIPATH_WRANDOM all=m i386=
-IP_ROUTE_MULTIPATH_DRR all=m i386=
+IP_ROUTE_MULTIPATH_CACHED all=y i386= x86_64=
+IP_ROUTE_MULTIPATH_RR all=m i386= x86_64=
+IP_ROUTE_MULTIPATH_RANDOM all=m i386= x86_64=
+IP_ROUTE_MULTIPATH_WRANDOM all=m i386= x86_64=
+IP_ROUTE_MULTIPATH_DRR all=m i386= x86_64=
 IP_ROUTE_VERBOSE all=y
 IP_PNP all=y
 IP_PNP_DHCP all=y
@@ -600,7 +600,7 @@
 INET6_AH all=m
 INET6_ESP all=m
 INET6_IPCOMP all=m
-IPV6_MIP6 all=y i386=m
+IPV6_MIP6 all=y i386=m x86_64=m
 INET6_XFRM_MODE_TRANSPORT all=m
 INET6_XFRM_MODE_TUNNEL all=m
 INET6_XFRM_MODE_BEET all=m
@@ -669,11 +669,11 @@
 IPX all=m
 IPX_INTERN all=y
 ATALK all=m
-DEV_APPLETALK all=y i386=m
-LTPC all=m
-COPS all=m
-COPS_DAYNA all=y
-COPS_TANGENT all=y
+DEV_APPLETALK all=y i386=m x86_64=m
+LTPC all=m x86_64=
+COPS all=m x86_64=
+COPS_DAYNA all=y x86_64=
+COPS_TANGENT all=y x86_64=
 IPDDP all=m
 IPDDP_ENCAP all=y
 IPDDP_DECAP all=y
@@ -728,7 +728,7 @@
 NET_EMATCH_META all=m
 NET_EMATCH_TEXT all=m
 NET_CLS_ACT all=y
-NET_ACT_POLICE all=m i386=y
+NET_ACT_POLICE all=m i386=y x86_64=y
 NET_ACT_GACT all=m
 GACT_PROB all=n
 NET_ACT_MIRRED all=m
@@ -736,7 +736,7 @@
 NET_ACT_PEDIT all=m
 NET_ACT_SIMP all=n
 NET_CLS_IND all=y
-NET_ESTIMATOR all=y i386=
+NET_ESTIMATOR all=y i386= x86_64=
 
 #
 # Network testing
@@ -758,14 +758,14 @@
 MKISS all=m
 6PACK all=m
 BPQETHER all=m
-DMASCC all=m i386=
-SCC all=m
-SCC_DELAY all=n
-SCC_TRXECHO all=y
+DMASCC all=m i386= x86_64=
+SCC all=m x86_64=
+SCC_DELAY all=n x86_64=
+SCC_TRXECHO all=y x86_64=
 BAYCOM_SER_FDX all=m
 BAYCOM_SER_HDX all=m
 BAYCOM_PAR all=m
-BAYCOM_EPP all=m
+BAYCOM_EPP all=m x86_64=
 YAM all=m
 IRDA all=m
 
@@ -814,21 +814,21 @@
 #
 # Old SIR device drivers
 #
-IRPORT_SIR all=m i386=
+IRPORT_SIR all=m i386= x86_64=
 
 #
 # Old Serial dongle support
 #
-DONGLE_OLD all=y i386=
-ESI_DONGLE_OLD all=m i386=
-ACTISYS_DONGLE_OLD all=m i386=
-TEKRAM_DONGLE_OLD all=m i386=
-GIRBIL_DONGLE_OLD all=m i386=
-LITELINK_DONGLE_OLD all=m i386=
-MCP2120_DONGLE_OLD all=m i386=
-OLD_BELKIN_DONGLE_OLD all=m i386=
-ACT200L_DONGLE_OLD all=m i386=
-MA600_DONGLE_OLD all=m i386=
+DONGLE_OLD all=y i386= x86_64=
+ESI_DONGLE_OLD all=m i386= x86_64=
+ACTISYS_DONGLE_OLD all=m i386= x86_64=
+TEKRAM_DONGLE_OLD all=m i386= x86_64=
+GIRBIL_DONGLE_OLD all=m i386= x86_64=
+LITELINK_DONGLE_OLD all=m i386= x86_64=
+MCP2120_DONGLE_OLD all=m i386= x86_64=
+OLD_BELKIN_DONGLE_OLD all=m i386= x86_64=
+ACT200L_DONGLE_OLD all=m i386= x86_64=
+MA600_DONGLE_OLD all=m i386= x86_64=
 
 #
 # FIR device drivers
@@ -837,7 +837,7 @@
 SIGMATEL_FIR all=m
 NSC_FIR all=m
 WINBOND_FIR all=m
-TOSHIBA_FIR all=m
+TOSHIBA_FIR all=m x86_64=
 SMC_IRCC_FIR all=m
 ALI_FIR all=m
 VLSI_FIR all=m
@@ -905,7 +905,7 @@
 # Connector - unified userspace <-> kernelspace linker
 #
 CONNECTOR all=m
-PROC_EVENTS all=y i386=
+PROC_EVENTS all=y i386= x86_64=
 
 #
 # Memory Technology Devices (MTD)
@@ -918,7 +918,7 @@
 MTD_REDBOOT_DIRECTORY_BLOCK all=-1
 MTD_REDBOOT_PARTS_UNALLOCATED all=y
 MTD_REDBOOT_PARTS_READONLY all=y
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-common.config?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-x86_64.config?r1=1.19&r2=1.20&f=u

More information about the pld-cvs-commit mailing list