SOURCES: kernel-vanilla-multiarch.conf - add x86_64 config

glen glen at pld-linux.org
Mon Jan 28 19:09:47 CET 2008


Author: glen                         Date: Mon Jan 28 18:09:47 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add x86_64 config

---- Files affected:
SOURCES:
   kernel-vanilla-multiarch.conf (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/kernel-vanilla-multiarch.conf
diff -u SOURCES/kernel-vanilla-multiarch.conf:1.6 SOURCES/kernel-vanilla-multiarch.conf:1.7
--- SOURCES/kernel-vanilla-multiarch.conf:1.6	Mon Jan 28 18:33:51 2008
+++ SOURCES/kernel-vanilla-multiarch.conf	Mon Jan 28 19:09:42 2008
@@ -3694,8 +3694,8 @@
 
 # kernel-vanilla-i386.conf
 X86_32 i386=y
-SEMAPHORE_SLEEPERS i386=y
-X86 i386=y
+SEMAPHORE_SLEEPERS i386=y x86_64=y
+X86 i386=y x86_64=y
 MMU i386=y
 GENERIC_ISA_DMA i386=y
 GENERIC_IOMAP i386=y
@@ -3705,7 +3705,7 @@
 #
 # Processor type and features
 #
-SMP i386=y
+SMP i386=y x86_64=y
 PARAVIRT i386=y
 TICK_ONESHOT i386=y
 NO_HZ i386=y
@@ -3755,25 +3755,27 @@
 
 X86_GENERIC i386=y
 X86_L1_CACHE_SHIFT i386=7
-RWSEM_GENERIC_SPINLOCK i386=y
+RWSEM_GENERIC_SPINLOCK i386=y x86_64=y
 ARCH_HAS_ILOG2_U32 i386=n
 ARCH_HAS_ILOG2_U64 i386=n
 GENERIC_CALIBRATE_DELAY i386=y
 X86_PPRO_FENCE i386=y
 X86_F00F_BUG i386=y
 X86_INTEL_USERCOPY i386=y
-HPET_TIMER i386=y
-HPET_EMULATE_RTC i386=y
-NR_CPUS i386=16
-SCHED_SMT i386=y
-SCHED_MC i386=y
+HPET_TIMER i386=y x86_64=y
+HPET_EMULATE_RTC i386=y x86_64=y
+NR_CPUS i386=16 x86_64=64
+SCHED_SMT i386=y x86_64=y
+SCHED_MC i386=y x86_64=y
 
 #
 # RCU implementation type:
 #
 X86_LOCAL_APIC i386=y
 X86_IO_APIC i386=y
-X86_MCE i386=y
+X86_MCE i386=y x86_64=y
+X86_MCE_INTEL x86_64=y
+X86_MCE_AMD x86_64=y
 X86_MCE_NONFATAL i386=y
 X86_MCE_P4THERMAL i386=y
 VM86 i386=y x86_64=y
@@ -3788,10 +3790,10 @@
 #
 # Firmware Drivers
 #
-EDD i386=m
+EDD i386=m x86_64=m
 EFI_VARS i386=m
-DELL_RBU i386=m
-DCDBAS i386=m
+DELL_RBU i386=m x86_64=m
+DCDBAS i386=m x86_64=m
 
 #
 # High Memory Support
@@ -3806,7 +3808,7 @@
 PAGE_OFFSET i386=0xC0000000
 HIGHMEM i386=y
 ARCH_FLATMEM_ENABLE i386=y
-ARCH_SPARSEMEM_ENABLE i386=y
+ARCH_SPARSEMEM_ENABLE i386=y x86_64=y
 ARCH_SELECT_MEMORY_MODEL i386=y
 HIGHPTE i386=n
 MATH_EMULATION i386=y
@@ -3815,14 +3817,14 @@
 IRQBALANCE i386=y
 BOOT_IOREMAP i386=y
 REGPARM i386=n
-SECCOMP i386=y
+SECCOMP i386=y x86_64=y
 
-KEXEC i386=y
-CRASH_DUMP i386=n
+KEXEC i386=y x86_64=y
+CRASH_DUMP i386=n x86_64=n
 COMPAT_VDSO i386=n
-PHYSICAL_START i386=0x100000
-HOTPLUG_CPU i386=n
-RELOCATABLE i386=n
+PHYSICAL_START i386=0x100000 x86_64=0x100000
+HOTPLUG_CPU i386=n x86_64=y
+RELOCATABLE i386=n x86_64=n
 PHYSICAL_ALIGN i386=0x100000
 
 
@@ -3833,34 +3835,34 @@
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-ACPI i386=y
-ACPI_PROCFS i386=y
-ACPI_SLEEP i386=y
-ACPI_SLEEP_PROC_FS i386=y
-ACPI_SLEEP_PROC_SLEEP i386=n
-ACPI_AC i386=m
-ACPI_BATTERY i386=m
-ACPI_BUTTON i386=m
-ACPI_VIDEO i386=m
-ACPI_HOTKEY i386=m
-ACPI_FAN i386=m
-ACPI_DOCK i386=m
-ACPI_BAY i386=m
-ACPI_PROCESSOR i386=m
-ACPI_THERMAL i386=m
-ACPI_ASUS i386=m
-ACPI_IBM i386=m
-ACPI_IBM_DOCK i386=n
-ACPI_TOSHIBA i386=m
-ACPI_CUSTOM_DSDT i386=n
-ACPI_BLACKLIST_YEAR i386=0
-ACPI_DEBUG i386=n
-ACPI_EC i386=y
-ACPI_POWER i386=y
-ACPI_SYSTEM i386=y
-X86_PM_TIMER i386=y
-ACPI_CONTAINER i386=m
-ACPI_SBS i386=m
+ACPI i386=y x86_64=y
+ACPI_PROCFS i386=y x86_64=y
+ACPI_SLEEP i386=y x86_64=y
+ACPI_SLEEP_PROC_FS i386=y x86_64=y
+ACPI_SLEEP_PROC_SLEEP i386=n x86_64=y
+ACPI_AC i386=m x86_64=m
+ACPI_BATTERY i386=m x86_64=m
+ACPI_BUTTON i386=m x86_64=m
+ACPI_VIDEO i386=m x86_64=m
+ACPI_HOTKEY i386=m x86_64=m
+ACPI_FAN i386=m x86_64=m
+ACPI_DOCK i386=m x86_64=m
+ACPI_BAY i386=m x86_64=m
+ACPI_PROCESSOR i386=m x86_64=m
+ACPI_THERMAL i386=m x86_64=m
+ACPI_ASUS i386=m x86_64=m
+ACPI_IBM i386=m x86_64=m
+ACPI_IBM_DOCK i386=n x86_64=n
+ACPI_TOSHIBA i386=m x86_64=m
+ACPI_CUSTOM_DSDT i386=n x86_64=n
+ACPI_BLACKLIST_YEAR i386=0 x86_64=0
+ACPI_DEBUG i386=n x86_64=n
+ACPI_EC i386=y x86_64=y
+ACPI_POWER i386=y x86_64=y
+ACPI_SYSTEM i386=y x86_64=y
+X86_PM_TIMER i386=y x86_64=y
+ACPI_CONTAINER i386=m x86_64=m
+ACPI_SBS i386=m x86_64=m
 APM i386=m
 APM_IGNORE_USER_SUSPEND i386=n
 APM_DO_ENABLE i386=n
@@ -3869,39 +3871,40 @@
 APM_RTC_IS_GMT i386=n
 APM_ALLOW_INTS i386=n
 APM_REAL_MODE_POWER_OFF i386=y
+ACPI_HOTPLUG_MEMORY x86_64=m
 
 #
 # CPU Frequency scaling
 #
-CPU_FREQ i386=y
-CPU_FREQ_TABLE i386=m
-CPU_FREQ_DEBUG i386=n
-CPU_FREQ_STAT i386=m
-CPU_FREQ_STAT_DETAILS i386=y
+CPU_FREQ i386=y x86_64=y
+CPU_FREQ_TABLE i386=m x86_64=m
+CPU_FREQ_DEBUG i386=n x86_64=n
+CPU_FREQ_STAT i386=m x86_64=m
+CPU_FREQ_STAT_DETAILS i386=y x86_64=y
 
 #
 # Default CPUFreq governor
 #
-CPU_FREQ_DEFAULT_GOV_PERFORMANCE i386=y x86_64=y sparc64=y
-CPU_FREQ_DEFAULT_GOV_USERSPACE i386=n ppc=y
-CPU_FREQ_GOV_PERFORMANCE i386=y
-CPU_FREQ_GOV_POWERSAVE i386=m
-CPU_FREQ_GOV_USERSPACE i386=m
-CPU_FREQ_GOV_ONDEMAND i386=m
-CPU_FREQ_GOV_CONSERVATIVE i386=m
+CPU_FREQ_DEFAULT_GOV_PERFORMANCE i386=y x86_64=y sparc64=y x86_64=y
+CPU_FREQ_DEFAULT_GOV_USERSPACE i386=n ppc=y x86_64=n
+CPU_FREQ_GOV_PERFORMANCE i386=y x86_64=y
+CPU_FREQ_GOV_POWERSAVE i386=m x86_64=m
+CPU_FREQ_GOV_USERSPACE i386=m x86_64=m
+CPU_FREQ_GOV_ONDEMAND i386=m x86_64=m
+CPU_FREQ_GOV_CONSERVATIVE i386=m x86_64=m
 
 #
 # CPUFreq processor drivers
 #
-X86_ACPI_CPUFREQ i386=m
+X86_ACPI_CPUFREQ i386=m x86_64=m
 X86_POWERNOW_K6 i386=m
 X86_POWERNOW_K7 i386=m
 X86_POWERNOW_K7_ACPI i386=y
-X86_POWERNOW_K8 i386=m
-X86_POWERNOW_K8_ACPI i386=y
+X86_POWERNOW_K8 i386=m x86_64=m
+X86_POWERNOW_K8_ACPI i386=y x86_64=y
 X86_GX_SUSPMOD i386=m
-X86_SPEEDSTEP_CENTRINO i386=m
-X86_SPEEDSTEP_CENTRINO_ACPI i386=y
+X86_SPEEDSTEP_CENTRINO i386=m x86_64=m
+X86_SPEEDSTEP_CENTRINO_ACPI i386=y x86_64=y
 X86_SPEEDSTEP_CENTRINO_TABLE i386=y
 X86_SPEEDSTEP_ICH i386=m
 X86_SPEEDSTEP_SMI i386=m
@@ -3914,14 +3917,14 @@
 #
 # shared options
 #
-X86_ACPI_CPUFREQ_PROC_INTF i386=y
-X86_SPEEDSTEP_LIB i386=m
+X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
+X86_SPEEDSTEP_LIB i386=m x86_64=n
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
-PCI i386=y
+PCI i386=y x86_64=y
 
 #
 # PCI access mode
@@ -3931,9 +3934,9 @@
 PCI_GODIRECT i386=n
 PCI_GOANY i386=y
 PCI_BIOS i386=y
-PCI_DIRECT i386=y
-PCI_MMCONFIG i386=y
-ISA_DMA_API i386=y
+PCI_DIRECT i386=y x86_64=y
+PCI_MMCONFIG i386=y x86_64=y
+ISA_DMA_API i386=y x86_64=y
 ISA i386=y
 EISA i386=y
 EISA_VLB_PRIMING i386=y
@@ -3944,55 +3947,54 @@
 SCx200 i386=m
 SCx200HR_TIMER i386=m
 
-
-PROFILING i386=y
-OPROFILE i386=m
-KPROBES i386=n
+PROFILING i386=y x86_64=y
+OPROFILE i386=m x86_64=m
+KPROBES i386=n x86_64=n
 
 #
 # Kernel hacking
 #
-PRINTK_TIME i386=n
-MAGIC_SYSRQ i386=y
-UNUSED_SYMBOLS i386=n
-DEBUG_KERNEL i386=y
-LOG_BUF_SHIFT i386=16
-DETECT_SOFTLOCKUP i386=n
-SCHEDSTATS i386=n
-DEBUG_SLAB i386=n
-DEBUG_RT_MUTEXES i386=n
-RT_MUTEX_TESTER i386=n
-DEBUG_SPINLOCK i386=n
-DEBUG_RWSEMS i386=n
-DEBUG_LOCK_ALLOC i386=n
-PROVE_LOCKING i386=n
-DEBUG_SPINLOCK_SLEEP i386=n
-DEBUG_LOCKING_API_SELFTESTS i386=n
-DEBUG_KOBJECT i386=n
+PRINTK_TIME i386=n x86_64=n
+MAGIC_SYSRQ i386=y x86_64=y
+UNUSED_SYMBOLS i386=n x86_64=n
+DEBUG_KERNEL i386=y x86_64=y
+LOG_BUF_SHIFT i386=16 x86_64=16
+DETECT_SOFTLOCKUP i386=n x86_64=n
+SCHEDSTATS i386=n x86_64=n
+DEBUG_SLAB i386=n x86_64=n
+DEBUG_RT_MUTEXES i386=n x86_64=n
+RT_MUTEX_TESTER i386=n x86_64=n
+DEBUG_SPINLOCK i386=n x86_64=n
+DEBUG_RWSEMS i386=n x86_64=n
+DEBUG_LOCK_ALLOC i386=n x86_64=n
+PROVE_LOCKING i386=n x86_64=n
+DEBUG_SPINLOCK_SLEEP i386=n x86_64=n
+DEBUG_LOCKING_API_SELFTESTS i386=n x86_64=n
+DEBUG_KOBJECT i386=n x86_64=n
 DEBUG_HIGHMEM i386=n
 DEBUG_BUGVERBOSE i386=y
-DEBUG_INFO i386=n
-DEBUG_FS i386=n
-DEBUG_VM i386=n
-FRAME_POINTER i386=n
-UNWIND_INFO i386=n
-FORCED_INLINING i386=y
-RCU_TORTURE_TEST i386=m
-FAULT_INJECTION i386=n
+DEBUG_INFO i386=n x86_64=n
+DEBUG_FS i386=n x86_64=n
+DEBUG_VM i386=n x86_64=n
+FRAME_POINTER i386=n x86_64=n
+UNWIND_INFO i386=n x86_64=n
+FORCED_INLINING i386=y x86_64=y
+RCU_TORTURE_TEST i386=m x86_64=m
+FAULT_INJECTION i386=n x86_64=n
 EARLY_PRINTK i386=y
-DEBUG_STACKOVERFLOW i386=n
-DEBUG_STACK_USAGE i386=n
+DEBUG_STACKOVERFLOW i386=n x86_64=n
+DEBUG_STACK_USAGE i386=n x86_64=n
 DEBUG_PAGEALLOC i386=n
-DEBUG_RODATA i386=n
+DEBUG_RODATA i386=n x86_64=n
 4KSTACKS i386=n
 X86_FIND_SMP_CONFIG i386=y
 X86_MPPARSE i386=y
 DOUBLEFAULT i386=y
 DEBUG_PARAVIRT i386=y
 
-GENERIC_HARDIRQS i386=y
-GENERIC_IRQ_PROBE i386=y
-GENERIC_PENDING_IRQ i386=y
+GENERIC_HARDIRQS i386=y x86_64=y
+GENERIC_IRQ_PROBE i386=y x86_64=y
+GENERIC_PENDING_IRQ i386=y x86_64=y
 X86_SMP i386=y
 X86_HT i386=y
 X86_BIOS_REBOOT i386=y
@@ -4001,16 +4003,16 @@
 
 
 # from common
-IDE i386=m
-BLK_DEV_IDE i386=m
-AGP i386=m
-FB_VGA16 i386=m
-MDA_CONSOLE i386=m
-FB_NVIDIA i386=m
-FB_RIVA i386=m
-FB_RADEON i386=m
-FB_ATY128 i386=m
-FB_ATY i386=m
+IDE i386=m x86_64=m
+BLK_DEV_IDE i386=m x86_64=m
+AGP i386=m x86_64=y
+FB_VGA16 i386=m x86_64=m
+MDA_CONSOLE i386=m x86_64=m
+FB_NVIDIA i386=m x86_64=m
+FB_RIVA i386=m x86_64=m
+FB_RADEON i386=m x86_64=m
+FB_ATY128 i386=m x86_64=m
+FB_ATY i386=m x86_64=m
 
 # 2.6.24
 PID_NS all=y
@@ -4052,3 +4054,74 @@
 NL80211 all=y
 
 NET_9P_FD all=m
+
+# kernel-vanilla-x86_64.conf
+X86_64 x86_64=y
+64BIT x86_64=y
+MMU x86_64=y
+GENERIC_CALIBRATE_DELAY x86_64=y
+X86_CMPXCHG x86_64=y
+EARLY_PRINTK x86_64=y
+GENERIC_ISA_DMA x86_64=y
+GENERIC_IOMAP x86_64=y
+ARCH_MAY_HAVE_PC_FDC x86_64=y
+DMI x86_64=y
+
+#
+# Subarchitecture Type
+#
+X86_PC x86_64=y
+X86_VSMP x86_64=n
+
+#
+# Processor family
+#
+MK8 x86_64=y
+MPSC x86_64=n
+MCORE2 x86_64=n
+GENERIC_CPU x86_64=n
+X86_L1_CACHE_BYTES x86_64=128
+X86_L1_CACHE_SHIFT x86_64=7
+X86_TSC x86_64=y
+X86_GOOD_APIC x86_64=y
+MICROCODE x86_64=m
+X86_MSR x86_64=m
+X86_CPUID x86_64=m
+X86_HT x86_64=y
+X86_IO_APIC x86_64=y
+X86_LOCAL_APIC x86_64=y
+MTRR x86_64=y
+
+#
+# RCU implementation type:
+#
+NUMA x86_64=y
+K8_NUMA x86_64=y
+X86_64_ACPI_NUMA x86_64=y
+NUMA_EMU x86_64=n
+ARCH_DISCONTIGMEM_ENABLE x86_64=y
+ARCH_DISCONTIGMEM_DEFAULT x86_64=y
+MEMORY_HOTPLUG x86_64=n
+HAVE_ARCH_EARLY_PFN_TO_NID x86_64=y
+CALGARY_IOMMU x86_64=y
+CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
+GART_IOMMU x86_64=y
+SWIOTLB x86_64=y
+CC_STACKPROTECTOR x86_64=n
+REORDER x86_64=y
+
+#
+# Executable file formats / Emulations
+#
+IA32_EMULATION x86_64=y
+IA32_AOUT x86_64=y
+COMPAT x86_64=y
+SYSVIPC_COMPAT x86_64=y
+
+#
+# Kernel hacking
+#
+IOMMU_DEBUG x86_64=n
+
+# cryptographic fo x86_64
+CRYPTO_TWOFISH_X86_64 x86_64=m
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vanilla-multiarch.conf?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list