- removed def_bool and other options we can't change

Changed files:
    kernel-x86.config -> 1.2

diff --git a/kernel-x86.config b/kernel-x86.config
index b227dc311d2024ce49940eb0269b1af866547df8..2c20c3f03c0dc21b4e69bc1a664794a82d451bdd 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -9,43 +9,9 @@ KPROBES x86=y
 #- *** FILE: arch/x86/Kconfig ***
 #-
 64BIT i386=n x86_64=y
-X86_32 i386=y x86_64=n
-X86_64 i386=n x86_64=y
-X86 x86=y
-GENERIC_TIME x86=y
-GENERIC_CMOS_UPDATE i386=y
-CLOCKSOURCE_WATCHDOG i386=y
-GENERIC_CLOCKEVENTS i386=y
-GENERIC_CLOCKEVENTS_BROADCAST i386=y
-LOCKDEP_SUPPORT x86=y
-STACKTRACE_SUPPORT x86=y
-MMU x86=y
-ZONE_DMA x86=y
-GENERIC_ISA_DMA x86=y
-GENERIC_IOMAP x86=y
-GENERIC_BUG x86=y
-GENERIC_HWEIGHT x86=y
-ARCH_MAY_HAVE_PC_FDC x86=y
-RWSEM_GENERIC_SPINLOCK x86=y
-ARCH_HAS_ILOG2_U32 x86=n
-ARCH_HAS_ILOG2_U64 x86=n
-GENERIC_CALIBRATE_DELAY x86=y
-GENERIC_TIME_VSYSCALL x86_64=y
-ZONE_DMA32 x86_64=y
-ARCH_POPULATES_NODE_MAP x86=y
-AUDIT_ARCH x86_64=y
-GENERIC_HARDIRQS x86=y
-GENERIC_IRQ_PROBE x86=y
-GENERIC_PENDING_IRQ x86=y
-X86_SMP i386=y
-X86_HT x86=y
-X86_BIOS_REBOOT i386=y
-X86_TRAMPOLINE i386=y
-KTIME_SCALAR i386=y
 #- file init/Kconfig goes here
 #- file kernel/time/Kconfig goes here
 SMP x86=y
-X86_FIND_SMP_CONFIG i386=y
 X86_MPPARSE i386=y x86_64=n
 X86_PC x86=y
 X86_ELAN i386=n
@@ -67,20 +33,15 @@ PARAVIRT i386=y
 MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
-HPET_EMULATE_RTC x86=y
-DMI x86=y
 CALGARY_IOMMU x86_64=y
 CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
 AMD_IOMMU x86_64=y
-SWIOTLB x86_64=y
 NR_CPUS x86=16
 SCHED_SMT x86=y
 SCHED_MC x86=y
 #- file kernel/Kconfig.preempt goes here
 X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
-X86_LOCAL_APIC x86=y
-X86_IO_APIC x86=y
 X86_MCE x86=y
 X86_MCE_INTEL x86_64=y
 X86_MCE_AMD x86_64=y
@@ -91,24 +52,18 @@ TOSHIBA i386=m
 I8K x86=m
 X86_REBOOTFIXUPS i386=y
 MICROCODE x86=m
-MICROCODE_OLD_INTERFACE x86=y
 X86_MSR x86=m
 X86_CPUID x86=m
 NOHIGHMEM i386=n
 HIGHMEM4G i386=y
 HIGHMEM64G i386=n
 PAGE_OFFSET i386=0xC0000000
-HIGHMEM i386=y
 NUMA x86_64=y
 #- NUMA (Summit) requires SMP, 64GB highmem support, ACPI
 K8_NUMA x86_64=n
 X86_64_ACPI_NUMA x86_64=y
 NUMA_EMU x86_64=n
 NODES_SHIFT x86_64=6
-ARCH_FLATMEM_ENABLE i386=y
-ARCH_SPARSEMEM_ENABLE x86=y
-ARCH_SELECT_MEMORY_MODEL i386=y
-ARCH_MEMORY_PROBE x86_64=y
 #- file mm/Kconfig goes here
 HIGHPTE i386=n
 MATH_EMULATION i386=y i686=n pentium3=n pentium4=n athlon=n
@@ -123,13 +78,11 @@ SECCOMP x86=y
 #- file kernel/Kconfig.hz goes here
 KEXEC x86=y
 CRASH_DUMP x86=n
-PHYSICAL_START i386=0x100000 x86_64=0x200000
+KEXEC_JUMP x86=n
 RELOCATABLE i386=y x86_64=n
 PHYSICAL_ALIGN i386=0x100000
 HOTPLUG_CPU x86=y
 COMPAT_VDSO x86=n
-ARCH_ENABLE_MEMORY_HOTPLUG x86=y
-HAVE_ARCH_EARLY_PFN_TO_NID x86_64=y
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
@@ -145,13 +98,10 @@ PCI_GOBIOS i386=n
 PCI_GOMMCONFIG i386=n
 PCI_GODIRECT i386=n
 PCI_GOANY i386=y
-PCI_BIOS i386=y
-PCI_DIRECT x86=y
 PCI_MMCONFIG x86=y
 DMAR x86=n
 #- file drivers/pci/pcie/Kconfig goes here
 #- file drivers/pci/Kconfig goes here
-ISA_DMA_API x86=y
 ISA i386=y
 EISA i386=y
 #- file drivers/eisa/Kconfig goes here
@@ -160,14 +110,11 @@ MCA i386=y
 SCx200 i386=m
 SCx200HR_TIMER i386=m
 OLPC i386=n
-K8_NB x86=y
 #- file drivers/pcmcia/Kconfig goes here
 #- file drivers/pci/hotplug/Kconfig goes here
 #- file fs/Kconfig.binfmt goes here
 IA32_EMULATION x86_64=y
 IA32_AOUT x86_64=y
-COMPAT x86_64=y
-SYSVIPC_COMPAT x86_64=y
 #- file net/Kconfig goes here
 #- file drivers/Kconfig goes here
 #- file drivers/firmware/Kconfig goes here
@@ -207,19 +154,13 @@ MVIAC7 i386=n
 MPSC x86_64=n
 MCORE2 x86=n
 GENERIC_CPU x86_64=y amd64=n
-X86_GENERIC i386=y
-X86_L1_CACHE_BYTES x86_64=128 amd64=64
-X86_CMPXCHG x86_64=y
-X86_L1_CACHE_SHIFT i386=7 x86_64=7 amd64=6
-X86_PPRO_FENCE i386=y
-X86_F00F_BUG i386=y
-X86_INTEL_USERCOPY i386=y
-X86_TSC x86_64=y
+X86_GENERIC i386=y i586=n i686=n pentium3=n pentium4=n athlon=n
+#* do we care ?
+X86_PPRO_FENCE i386=y pentium3= pentium4= athlon=
 
 #-
 #- *** FILE: arch/x86/Kconfig.debug ***
 #-
-TRACE_IRQFLAGS_SUPPORT x86=y
 #- file lib/Kconfig.debug goes here
 STRICT_DEVMEM x86=y
 X86_VERBOSE_BOOTUP x86=n
@@ -233,7 +174,6 @@ DEBUG_RODATA x86=n
 DIRECT_GBPAGES x86=n
 DEBUG_NX_TEST x86=m
 4KSTACKS i386=n
-DOUBLEFAULT i386=y
 IOMMU_DEBUG x86_64=n
 MMIOTRACE x86=n
 IO_DELAY_0X80 x86=y
@@ -251,7 +191,6 @@ OPTIMIZE_INLINING x86=n
 X86_ACPI_CPUFREQ x86=m
 X86_POWERNOW_K6 i386=m
 X86_POWERNOW_K7 i386=m
-X86_POWERNOW_K7_ACPI i386=y
 X86_POWERNOW_K8 x86=m
 X86_POWERNOW_K8_ACPI x86=y
 X86_GX_SUSPMOD i386=m
@@ -266,13 +205,11 @@ X86_LONGHAUL i386=m
 X86_E_POWERSAVER i386=m
 #- shared options
 X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=n
-X86_SPEEDSTEP_LIB x86=m
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 
 #-
 #- *** FILE: arch/x86/kvm/Kconfig ***
 #-
-HAVE_KVM x86=y
 VIRTUALIZATION x86=y
 KVM x86=m
 KVM_INTEL x86=m