- options which belong to arch/x86 moved from multiarch.config to x86.config

Changed files:
    kernel-multiarch.config -> 1.24
    kernel-x86.config -> 1.18

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index d9b55a3597ea13a6e21008b3dc7b60ea2d3a8d88..ee9ae7b573c2dd0e56ada583a2aaf0b071bcc2ec 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1,14 +1,4 @@
 
-#-
-#- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
-#-
-DEBUG_RODATA all=y
-DEBUG_RODATA_TEST all=n
-IOMMU_STRESS all=n
-OPROFILE_EVENT_MULTIPLEX all=n
-X86_MCE_INJECT all=m
-X86_MRST all=y
-
 #-
 #- *** FILE: block/Kconfig ***
 #-

diff --git a/kernel-x86.config b/kernel-x86.config
index db2901f556d8a899da765b47e640d44ae5d19f6e..3852f23d6502f0e25c7a5e10631b9edeb9daf522 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -4,6 +4,7 @@
 #-
 OPROFILE x86=m
 OPROFILE_IBS x86=n
+OPROFILE_EVENT_MULTIPLEX all=n
 KPROBES x86=y
 #- file kernel/gcov/Kconfig goes here
 
@@ -22,6 +23,7 @@ X86_EXTENDED_PLATFORM i386=y x86_64=y
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
 X86_ELAN i386=n
+X86_MRST all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
 X86_NUMAQ i386=n
@@ -53,6 +55,7 @@ X86_MCE x86=y
 X86_MCE_INTEL x86_64=y i686=y
 X86_MCE_AMD x86_64=y i686=y
 X86_ANCIENT_MCE i686=y
+X86_MCE_INJECT all=m
 VM86 i386=y
 TOSHIBA i386=m
 I8K x86=m
@@ -187,9 +190,12 @@ DEBUG_STACKOVERFLOW x86=n
 DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
 X86_PTDUMP x86=n
+DEBUG_RODATA all=y
+DEBUG_RODATA_TEST all=n
 DEBUG_NX_TEST x86=m
 4KSTACKS i386=n
 IOMMU_DEBUG x86_64=n
+IOMMU_STRESS all=n
 IO_DELAY_0X80 x86=y
 IO_DELAY_0XED x86=n
 IO_DELAY_UDELAY x86=n